From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 23 Jun 2014 05:31:05 +0000 (+0000)
Subject: Fixing sysdyn product build site projects for 1.8.1.
X-Git-Tag: 1.8.1~11
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=d066945b34c8b13196b9054fbbea2b5a855ff9dc;p=simantics%2Fsysdyn.git

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 9dd09c8c..53fe0cb9 100644
--- 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}"/>
 		<echo message="${repository}"/>
 		<echo message="${destination}"/>
-		<java jar="${equinox.launcher.jar}" fork="true" failonerror="true" >
+		<java jar="${equinox.launcher.jar}" fork="true" failonerror="false" resultproperty="director.result" outputproperty="director.out" errorproperty="director.err">
 			<arg value="-application"/>
 			<arg value="org.eclipse.equinox.p2.director"/>
 			<arg value="-artifactRepository"/>
@@ -45,5 +45,14 @@
 			<arg value="${target.arch}" />
 			<arg value="-consoleLog"/>
 		</java>
+		<echo message="director.out: '${director.out}'"/>
+		<echo message="director.err: '${director.err}'"/>
+		<fail message="P2 director failed">
+			<condition>
+				<not>
+					<equals arg1="${director.result}" arg2="0" />
+				</not>
+			</condition>
+		</fail>
 	</target>
 </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 8612af15..a98233e7 100644
--- a/org.simantics.sysdyn.product.site.feature/feature.xml
+++ b/org.simantics.sysdyn.product.site.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.simantics.sysdyn.product.site"
       label="Sysdyn Product Site"
-      version="1.5.1.qualifier"
+      version="1.8.1.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description url="http://www.example.com/description">
diff --git a/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script b/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script
index f7398637..c2009ffa 100644
--- 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'
+importtargetdefinition -A 'http://www.simantics.org/download/1.15/simantics.target'
 import 'site.cquery'
 build
 perform -D target.os=* -D target.ws=* -D target.arch=* org.simantics.sysdyn.product.site#site.p2
diff --git a/org.simantics.sysdyn.product.site.feature/site.cquery b/org.simantics.sysdyn.product.site.feature/site.cquery
index 678b963e..d3652d6c 100644
--- 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="*"/>
     <cq:advisorNode namePattern=".*\.source$" componentType="osgi.bundle" skipComponent="true"/>
     <cq:advisorNode namePattern=".*\.source$" componentType="eclipse.feature" skipComponent="true"/>
-    <cq:advisorNode namePattern=".*" branchTagPath="main"/>
+    <cq:advisorNode namePattern=".*" branchTagPath="simantics-1.15,main"/>
 </cq:componentQuery>