[TeamTalk 331]: [867] trunk/TeamTalk/Agents/PenDecoder: Made PenDecoder ant script use OLYMPUS_ROOT to access Galaxy java bindings .

[tk@edam.speech.cs.cmu.edu]

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071107/6747e8be/attachment.html
-------------- next part --------------
Modified: trunk/TeamTalk/Agents/PenDecoder/build.xml
===================================================================
--- trunk/TeamTalk/Agents/PenDecoder/build.xml	2007-11-07 16:33:02 UTC (rev 866)
+++ trunk/TeamTalk/Agents/PenDecoder/build.xml	2007-11-07 18:01:34 UTC (rev 867)
@@ -66,4 +66,16 @@
     nbproject/build-impl.xml file. 
 
     -->
+    <target name="-pre-init">
+        <property environment="env."/>
+        <tempfile property="env.properties" prefix="env" suffix=".properties"/>
+        <echoproperties destfile="${env.properties}">
+            <propertyset>
+                <propertyref prefix="env."/>
+                <mapper type="glob" from="env.*" to="Env-*"/>
+            </propertyset>
+        </echoproperties>
+        <property file="${env.properties}"/>
+        <delete file="${env.properties}"/>
+    </target>
 </project>

Modified: trunk/TeamTalk/Agents/PenDecoder/nbproject/project.properties
===================================================================
--- trunk/TeamTalk/Agents/PenDecoder/nbproject/project.properties	2007-11-07 16:33:02 UTC (rev 866)
+++ trunk/TeamTalk/Agents/PenDecoder/nbproject/project.properties	2007-11-07 18:01:34 UTC (rev 867)
@@ -16,11 +16,15 @@
 dist.dir=dist
 dist.jar=${dist.dir}/PenDecoder.jar
 dist.javadoc.dir=${dist.dir}/javadoc
+file.reference.bsh-core-2.0b4.jar=bsh-core-2.0b4.jar
+file.reference.bsh-util-2.0b4.jar=bsh-util-2.0b4.jar
+file.reference.galaxy.jar=${Env-OLYMPUS_ROOT}/Libraries/Galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar
 file.reference.PenDecoder-src=src
 jar.compress=false
 javac.classpath=\
-    ${libs.BeanShell.classpath}:\
-    ${libs.Galaxy.classpath}
+    ${file.reference.bsh-core-2.0b4.jar}:\
+    ${file.reference.bsh-util-2.0b4.jar}:\
+    ${file.reference.galaxy.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint
 javac.deprecation=false
@@ -41,12 +45,6 @@
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
-# Property libs.BeanShell.classpath is set here just to make sharing of project simpler.
-# The library definition has always preference over this property.
-libs.BeanShell.classpath=bsh-core-2.0b4.jar;bsh-util-2.0b4.jar
-# Property libs.Galaxy.classpath is set here just to make sharing of project simpler.
-# The library definition has always preference over this property.
-libs.Galaxy.classpath=../../Libraries/Galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar
 main.class=edu.cmu.ravenclaw.pendecoder.PenDecoderServer
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF