Fixing sysdyn product build site projects for 1.8.1.

refs #4984

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@29680 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.product.site.feature/build/product.ant b/org.simantics.sysdyn.product.site.feature/build/product.ant
index 9dd09c8c617cb1f042310b8b0384ea5b176f3ce2..53fe0cb99f15e71f8ec4f945b7bca32eed18faf1 100644 (file)
--- a/org.simantics.sysdyn.product.site.feature/build/product.ant
+++ b/org.simantics.sysdyn.product.site.feature/build/product.ant
@@ -19,7 +19,7 @@
                <echo message="${equinox.launcher.jar}"/>\r
                <echo message="${repository}"/>\r
                <echo message="${destination}"/>\r
-               <java jar="${equinox.launcher.jar}" fork="true" failonerror="true" >\r
+               <java jar="${equinox.launcher.jar}" fork="true" failonerror="false" resultproperty="director.result" outputproperty="director.out" errorproperty="director.err">\r
                        <arg value="-application"/>\r
                        <arg value="org.eclipse.equinox.p2.director"/>\r
                        <arg value="-artifactRepository"/>\r
@@ -45,5 +45,14 @@
                        <arg value="${target.arch}" />\r
                        <arg value="-consoleLog"/>\r
                </java>\r
+               <echo message="director.out: '${director.out}'"/>\r
+               <echo message="director.err: '${director.err}'"/>\r
+               <fail message="P2 director failed">\r
+                       <condition>\r
+                               <not>\r
+                                       <equals arg1="${director.result}" arg2="0" />\r
+                               </not>\r
+                       </condition>\r
+               </fail>\r
        </target>\r
 </project>
\ No newline at end of file

diff --git a/org.simantics.sysdyn.product.site.feature/feature.xml b/org.simantics.sysdyn.product.site.feature/feature.xml
index 8612af15263b275521d86f5c45c87805f9bdb409..a98233e78d0fe7d2c871b0d43e5c6efb986cb7e7 100644 (file)
--- a/org.simantics.sysdyn.product.site.feature/feature.xml
+++ b/org.simantics.sysdyn.product.site.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.sysdyn.product.site"\r
       label="Sysdyn Product Site"\r
-      version="1.5.1.qualifier"\r
+      version="1.8.1.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description url="http://www.example.com/description">\r

diff --git a/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script b/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script
index f7398637e5c7c0c6d49e29d085fd4364bb383012..c2009ffaa74692ec00f65b71e23a47920e415f9b 100644 (file)
--- a/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script
+++ b/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script
@@ -1,4 +1,4 @@
-importtargetdefinition -A 'd:/target/3.7.1/target-win.target'\r
+importtargetdefinition -A 'http://www.simantics.org/download/1.15/simantics.target'\r
 import 'site.cquery'\r
 build\r
 perform -D target.os=* -D target.ws=* -D target.arch=* org.simantics.sysdyn.product.site#site.p2\r

diff --git a/org.simantics.sysdyn.product.site.feature/site.cquery b/org.simantics.sysdyn.product.site.feature/site.cquery
index 678b963ee5cb406581379178dcdebc063215f978..d3652d6cc65481b91a7e49c95b70aa1a3ad1e7e3 100644 (file)
--- a/org.simantics.sysdyn.product.site.feature/site.cquery
+++ b/org.simantics.sysdyn.product.site.feature/site.cquery
@@ -6,5 +6,5 @@
     <cq:property key="target.ws" value="*"/>\r
     <cq:advisorNode namePattern=".*\.source$" componentType="osgi.bundle" skipComponent="true"/>\r
     <cq:advisorNode namePattern=".*\.source$" componentType="eclipse.feature" skipComponent="true"/>\r
-    <cq:advisorNode namePattern=".*" branchTagPath="main"/>\r
+    <cq:advisorNode namePattern=".*" branchTagPath="simantics-1.15,main"/>\r
 </cq:componentQuery>\r