Improve bootstrap mode

sources

@@ -1,3 +1,3 @@
 SHA512 (fedoraproject-p2-f0168e8.tar.xz) = 4f6028b7e3901fd218ec61b368329bf3871d74b96b7339efc39a07bd009f194c7eeeb5abe77a7b94a4f6c13b5cb31b4a7914a28d90cfaed9a2706632e93556e3
 SHA512 (org.eclipse.tycho-tycho-1.0.0.tar.xz) = 31a082931e578c03d1a7e435944c0d61b1062a99b54c25ae67a705858691855fbd163eba01642210a7a11376e53f7ffa65b29df1f41f3f2dc71771df9d13f10a
-SHA512 (eclipse-bootstrap-oxygen.tar.xz) = ded89ac21a7d3dfe143989f817505ea8f0ab8f3c70c41a19a4f786c3f7537bc8c9d497b68d80460cdce5750f7a589c8b211b5e3f71179e3e81e0e633f81ef47b
+SHA512 (eclipse-bootstrap-oxygen.tar.xz) = 3d5694dd0d97334ec780c8e8df9d884f55b892e445a9afa371acb62bfb6d242a369728f7411d798a8274b2efa5c7cfbe1c7195c60e3992c88a520f9dda2fe55c

tycho-bootstrap.sh

@@ -5,7 +5,8 @@
 eclipse_bootstrap=$1
 preV=$2
 v="$preV-SNAPSHOT"
-osgiV='3.11.0.v20160419-1000'
+osgiV='3.12.0.v20170419-1339'
+osgiCompatV='1.0.300.v20170419-1339'
 fp2V='0.0.1-SNAPSHOT'
 bundles=()
 bundles[0]='tycho-bundles/org.eclipse.tycho.embedder.shared'
@@ -88,8 +89,8 @@ popd
 # Run the build on this maven reactor project
 for proj in ${reactorprojs[@]} ; do
   isolateProject ${proj}
-  xmvn -o -f "${proj}/pom.xml" -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.test.skip=true \
-    -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 \
+  xmvn -B -o -e -f "${proj}/pom.xml" -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.test.skip=true \
+    -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 -Dproject.build.sourceEncoding=UTF-8 \
     clean install
   unifyProject ${proj}
 done
@@ -135,6 +136,7 @@ mkdir -p ${loc}
 cp "${tbeTargetDir}/tycho-bundles-external-${v}.zip" ${loc}
 cp 'tycho-bundles/tycho-bundles-external/pom.xml' "${loc}/tycho-bundles-external-${v}.pom"
 
-sed -i "s/<equinox\(.*\)VersionMaven>.*<\/equinox\(.*\)VersionMaven>/<equinox\1VersionMaven>${osgiV}<\/equinox\1VersionMaven>/" pom.xml
+sed -i "s/<equinoxVersionMaven>.*<\/equinoxVersionMaven>/<equinoxVersionMaven>${osgiV}<\/equinoxVersionMaven>/" pom.xml
+sed -i "s/<equinoxCompatVersionMaven>.*<\/equinoxCompatVersionMaven>/<equinoxCompatVersionMaven>${osgiCompatV}<\/equinoxCompatVersionMaven>/" pom.xml
 # xmvn-p2-installer-plugin needs to find the org.eclipse.osgi bundle
 sed -i "s/>\${equinox-version}</>${osgiV}</" fedoraproject-p2/xmvn-p2-installer-plugin/pom.xml

tycho-scripts.sh

@@ -56,7 +56,8 @@ cp "${basedir}/pom.xml" "${loc}/${bName}-${version}.pom"
 
 function copyBundles () {
 
-# scls='scl1 scl2 scl3'
+# X_SCLS expands to list of currently enabled SCLs, in the order they were enabled, if any
+scls="$X_SCLS"
 baseLocations=( '/usr/share/java' '/usr/lib/java' '/usr/lib/eclipse' )
 osgiLocations=(${baseLocations[@]} ${osgiLocations[@]} )
 for scl in ${scls} ; do
@@ -94,7 +95,8 @@ function symlinkBundles () {
 # Bootstrap Built Tycho provides some Eclipse bundles
 # Prevent non-bootstrap build's de-bundling from symlinking to them
 # SCL priority is from right to left.
-# scls='scl1 scl2 scl3'
+# X_SCLS expands to list of currently enabled SCLs, in the order they were enabled, if any
+scls="$X_SCLS"
 baseLocations=( '/usr/share/java/eclipse' '/usr/share/java' '/usr/lib/java' )
 osgiLocations=(${baseLocations[@]} ${osgiLocations[@]} )
 for scl in ${scls} ; do
@@ -130,7 +132,7 @@ echo ${arr[@]}
 
 function isolateProject () {
 sed -i "/<artifactId>org.eclipse.osgi<\/artifactId>/ a <version>${osgiV}</version>" "$1/pom.xml"
-sed -i "/<artifactId>org.eclipse.osgi.compatibility.state<\/artifactId>/ a <version>${osgiV}</version>" "$1/pom.xml"
+sed -i "/<artifactId>org.eclipse.osgi.compatibility.state<\/artifactId>/ a <version>${osgiCompatV}</version>" "$1/pom.xml"
 
 cp $1/pom.xml $1/pom.xml.bak
 
@@ -147,7 +149,7 @@ function unifyProject () {
 
 cp $1/pom.xml.bak $1/pom.xml
 sed -i "/<version>${osgiV}<\/version>/ d" "$1/pom.xml"
-
+sed -i "/<version>${osgiCompatV}<\/version>/ d" "$1/pom.xml"
 }
 
 function readBSN () {

tycho.spec

@@ -25,7 +25,7 @@
 
 Name:           tycho
 Version:        1.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 # license file is missing but all files having some licensing information are ASL 2.0
@@ -361,6 +361,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Jun 20 2017 Mat Booth <mat.booth@redhat.com> - 1.0.0-6
+- Improve bootstrap mode
+
 * Sat Jun 17 2017 Mat Booth <mat.booth@redhat.com> - 1.0.0-5
 - Debootstrap build