# HG changeset patch # User John Kern # Date 1267580173 28800 # Node ID c9394af976fe355f055ce81daf2fb3e66e2d548b # Parent 3a649437adec6599e7bf8b2dc4ad2df36cffeeeb bug 1872 - fix installation details dialog diff -r 3a649437adec -r c9394af976fe scripts/build.properties.SED --- a/scripts/build.properties.SED Tue Mar 02 14:35:28 2010 -0800 +++ b/scripts/build.properties.SED Tue Mar 02 17:36:13 2010 -0800 @@ -244,5 +244,13 @@ # Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties. javacTarget=1.5 + +# Integration with p2 +p2.gathering=true +generate.p2.metadata=true +p2.flavor=tooling +p2.metadata.repo=file:${buildDirectory}/repo +p2.artifact.repo=file:${buildDirectory}/repo +p2.publish.artifacts=true diff -r 3a649437adec -r c9394af976fe scripts/shepard.sh --- a/scripts/shepard.sh Tue Mar 02 14:35:28 2010 -0800 +++ b/scripts/shepard.sh Tue Mar 02 17:36:13 2010 -0800 @@ -5,6 +5,7 @@ SCRIPTS_DIR=/home/symbian/wrttools/scripts BASE_DIR=/home/symbian/scratch/build_dir DAY_OF_YEAR=`date +%j` +ECLIPSE_TIMESTAMP=`date +%Y%m%d%H%M%S` HG_CMD=/usr/local/bin/hg ANT_CMD=/usr/local/apache-ant-1.8.0/bin/ant @@ -30,5 +31,15 @@ # set the build directory in the build.properties files. cat ${SOURCE_DIR}/scripts/build.properties.SED | sed -e s#SED_BUILD_DIR#${BUILD_DIR}#g > ${SOURCE_DIR}/scripts/build.properties +# bug fix for 1872. [testcase: go to about box. click on installation details. Do you see an error? ] +for f in `find ${SOURCE_DIR} -name MANIFEST.MF` +do + cat $f | sed -e s#\.qualifier##g > ${f} +done + +# wrt-ide.product has the orginal reference to 1.0.0.qualifier. Try deleting .qualifier +prod_file=${SOURCE_DIR}/org.symbian.tools.wrttools.product/wrt-ide.product +cat $prod_file | sed -e s#\.qualifier##g > $prod_file + ${ANT_CMD} -DbuildDirectory=${BUILD_DIR} -DsourceDirectory=${SOURCE_DIR}