[jboss-svn-commits] JBL Code SVN: r37791 - in labs/jbosstm/branches/JBOSSTS_4_16: ArjunaJTS/jts and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Dec 12 06:30:31 EST 2011
Author: jhalliday
Date: 2011-12-12 06:30:31 -0500 (Mon, 12 Dec 2011)
New Revision: 37791
Modified:
labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jtax/build.xml
labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/build.xml
labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/orbportability/build.xml
labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/orbportability/config/idl-compiler-definitions.xml
labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/build-jts.xml
Log:
Add generate_helper support to jacorb in build. JBTM-1004
Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jtax/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jtax/build.xml 2011-12-12 09:05:29 UTC (rev 37790)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jtax/build.xml 2011-12-12 11:30:31 UTC (rev 37791)
@@ -47,7 +47,7 @@
<idl-compiler orb="JacORB"
buildlist="${idl.buildlist}"
destdir="${basedir}/${build.dir}/tests/generatedclasses"
- parameters="include='idl/omg/;idl/arjuna;${jacorb.home}/idl/omg',classpath='${jacorb.classpath}'"/>
+ parameters="include='idl/omg/;idl/arjuna;${jacorb.home}/idl/omg',classpath='${jacorb.classpath}',generate_helper='portable'"/>
</target>
<target name="run.tests">
Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/build.xml 2011-12-12 09:05:29 UTC (rev 37790)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/build.xml 2011-12-12 11:30:31 UTC (rev 37791)
@@ -65,7 +65,7 @@
<idl-compiler orb="JacORB"
buildlist="${idl.buildlist}" verbose="true"
destdir="${basedir}/${build.dir}/generatedclasses"
- parameters="include='${basedir}/idl/omg/;${basedir}/idl/arjuna;${jacorb.home}/idl/omg',classpath='${jacorb.classpath}'"/>
+ parameters="include='${basedir}/idl/omg/;${basedir}/idl/arjuna;${jacorb.home}/idl/omg',classpath='${jacorb.classpath}',generate_helper='deprecated'"/>
</target>
<target name="compile-tests-idl" depends="sharedbuild-jts.compile-tests-idl">
@@ -78,7 +78,7 @@
<idl-compiler orb="JacORB"
buildlist="${idl.buildlist}"
destdir="${basedir}/${build.dir}/tests/generatedclasses"
- parameters="include='${basedir}/idl/omg/;${basedir}/idl/arjuna;${jacorb.home}/idl/omg',classpath='${jacorb.classpath}'"/>
+ parameters="include='${basedir}/idl/omg/;${basedir}/idl/arjuna;${jacorb.home}/idl/omg',classpath='${jacorb.classpath}',generate_helper='portable'"/>
</target>
<target name="run.tests">
@@ -119,7 +119,7 @@
</run.tests.macro>
<emma.report.macro/>
-
+
</target>
</project>
\ No newline at end of file
Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/orbportability/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/orbportability/build.xml 2011-12-12 09:05:29 UTC (rev 37790)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/orbportability/build.xml 2011-12-12 11:30:31 UTC (rev 37791)
@@ -46,6 +46,9 @@
<target name="compile-tests" depends="compile-tests-idl">
<compile-tests.macro>
+ <additional.classpath>
+ <path refid="jacorb.classpath"/>
+ </additional.classpath>
<additional.src.dirs>
<src location="${build.dir}/tests/generatedclasses"/>
</additional.src.dirs>
@@ -61,9 +64,9 @@
</idl-build-list>
<idl-compiler orb="JacORB"
- buildlist="${idl.buildlist}"
- destdir="${basedir}/${build.dir}/tests/generatedclasses"
- parameters="include='${jacorb.home}/idl/omg/',classpath='${jacorb.classpath}'"/>
+ buildlist="${idl.buildlist}"
+ destdir="${basedir}/${build.dir}/tests/generatedclasses"
+ parameters="include='${jacorb.home}/idl/omg/',classpath='${jacorb.classpath}',generate_helper='portable'"/>
</target>
@@ -92,7 +95,7 @@
</run.tests.macro>
<emma.report.macro/>
-
+
</target>
</project>
Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/orbportability/config/idl-compiler-definitions.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/orbportability/config/idl-compiler-definitions.xml 2011-12-12 09:05:29 UTC (rev 37790)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/orbportability/config/idl-compiler-definitions.xml 2011-12-12 11:30:31 UTC (rev 37791)
@@ -30,6 +30,7 @@
<param name="filename" required="true"/>
<param name="classpath" required="true" delimiter=";" classpath="true"/>
<param name="mapping" required="false" delimiter=";"/>
+ <param name="generate_helper" required="true"/>
</in-parameters>
<idl-executable>java -cp ${classpath} org.jacorb.idl.parser</idl-executable>
@@ -39,6 +40,8 @@
<param>${destdir}</param>
<param>-DORB_OTS_SUPPORT=1</param>
<param>-DORB_CURRENT_SUPPORT=1</param>
+ <param>-generate_helper</param>
+ <param>${generate_helper}</param>
<param foreach="include">-I${include}</param>
<param foreach="mapping">
<sub-param>-i2jpackage</sub-param>
Modified: labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/build-jts.xml 2011-12-12 09:05:29 UTC (rev 37790)
+++ labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/build-jts.xml 2011-12-12 11:30:31 UTC (rev 37791)
@@ -41,8 +41,11 @@
<property name="org.jboss.jbossts.qa.orb.name.short" value="jacorb"/>
<property name="org.jboss.jbossts.qa.orb.name.long" value="JacORB"/>
<property name="org.jboss.jbossts.qa.orb.home" value="${org.jboss.jbossts.qa.ts.home}/jacorb"/>
- <property name="org.jboss.jbossts.qa.orb.classpath" value="${org.jboss.jbossts.qa.orb.home}/lib/jacorb.jar;${org.jboss.jbossts.qa.orb.home}/lib/idl.jar;${org.jboss.jbossts.qa.orb.home}/lib/logkit-1.2.jar"/>
+ <path id="org.jboss.jbossts.qa.orb.classpath">
+ <fileset dir="${org.jboss.jbossts.qa.orb.home}/lib" includes="*.jar"/>
+ </path>
+
<path id="jts.classpath">
<fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/">
<include name="jbossjts.jar"/>
@@ -53,7 +56,7 @@
</fileset>
<pathelement location="../../ArjunaJTS/orbportability/config"/>
<!--<fileset file="${org.jboss.jbossts.qa.server_manager_location}" />-->
- <pathelement path="${org.jboss.jbossts.qa.orb.classpath}"/>
+ <path refid="org.jboss.jbossts.qa.orb.classpath"/>
<fileset dir="../../build/extlib" includes="junit.jar"/>
<pathelement location="../ext/jboss-profiler-jvmti.jar"/>
<pathelement location="../../ArjunaJTS/jts/build/lib/jts_tests.jar"/>
@@ -178,10 +181,12 @@
<taskdef name="idl-compiler" classname="com.arjuna.orbportability.common.ant.IDLCompiler"
classpathref="jts.classpath"/>
+ <property name="org.jboss.jbossts.qa.orb.classpath" refid="org.jboss.jbossts.qa.orb.classpath"/>
+
<idl-compiler orb="${org.jboss.jbossts.qa.orb.name.long}"
buildlist="${org.jboss.jbossts.qa.jts.idl.buildlist}"
destdir="${org.jboss.jbossts.qa.build.idl}"
- parameters="include='${org.jboss.jbossts.qa.ts.home}/idl/;${org.jboss.jbossts.qa.orb.home}/idl/omg',classpath='${org.jboss.jbossts.qa.orb.classpath}'"/>
+ parameters="include='${org.jboss.jbossts.qa.ts.home}/idl/;${org.jboss.jbossts.qa.orb.home}/idl/omg',classpath='${org.jboss.jbossts.qa.orb.classpath}',generate_helper='portable'"/>
<javac srcdir="${org.jboss.jbossts.qa.build.idl}"
destdir="${org.jboss.jbossts.qa.build.classes}"
More information about the jboss-svn-commits
mailing list