Changeset 1330

Timestamp:

03/06/07 20:41:28 (18 months ago)

Author:

jmoore

Message:

#601 Handling libOMERO...so symlinks in <dist/>

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• lib/tools/ant-nodeps-1.6.5.jar (added)
• lib/tools/omero.java (modified) (2 diffs)
• omero.class (modified) (previous)

trunk/build.xml

@@ -159 +159 @@
                         <flattenmapper/>
                 </copy>
+
                 <copy todir="${dist.dir}/include">
-                        <fileset dir="${blitz.comp}" includes="**/*.h,**/*.ice"/>
+                        <fileset dir="${blitz.comp}/src/cpp" includes="**/*.h"/>
+                        <fileset dir="${blitz.comp}/src/cpp/generated" includes="**/*.h"/>
+                        <fileset dir="${blitz.comp}/resources/slice" includes="**/*.ice"/>
+                        <fileset dir="${blitz.comp}/target/generated/resources" includes="**/*.ice"/>
+                </copy>
+
+                <symlink action="record" linkfilename=".library.links">
+                        <fileset dir="${blitz.comp}/src/cpp/.libs" includes="*.so*"/>
+                </symlink>
+                <copy todir="${dist.dir}/lib">
+                        <fileset dir="${blitz.comp}/src/cpp/.libs" includes="**/*.so*" followsymlinks="false"/>
+                        <fileset dir="${blitz.comp}/src/cpp/.libs" includes="**/*.links" followsymlinks="false"/>
                         <flattenmapper/>
                 </copy>
-                <copy todir="${dist.dir}/lib">
-                        <fileset dir="${blitz.comp}" includes="**/*.la"/>
-                        <flattenmapper/>
-                </copy>
+                <symlink action="recreate">
+                        <fileset dir="${dist.dir}/lib" includes="*.links"/>
+                </symlink>
+
                 <copy todir="${dist.dir}/blitz">
                         <fileset dir="${blitz.comp}/target/standalone" includes="**/*"/>
                 </copy>
+
                 <copy todir="${dist.dir}/client">
                         <fileset dir="${common.comp}/${target.rel}" includes="*.jar"/>

trunk/lib/tools/omero.java

@@ -191 +191 @@
         throws Exception
     {
-        File[] jars = new File[7];
+        File[] jars = new File[8];
         jars[0] = new File(mavenPath("ant","ant","1.6.5"));
         jars[1] = new File(mavenPath("ant","ant-launcher","1.6.5"));
@@ -198 +198 @@
         jars[4] = new File(mavenPath("junit","junit","3.8.1"));
         jars[5] = new File("lib/tools/ant-junit-1.6.5.jar");
-        jars[6] = new File("lib/tools/bsh-2.0b4.jar");
+        jars[6] = new File("lib/tools/ant-nodeps-1.6.5.jar");
+        jars[7] = new File("lib/tools/bsh-2.0b4.jar");
         //jars[7] = new File("lib/tools/ant-apache-log4j.jar");
         //jars[5] = new File(mavenPath("log4j","log4j","1.2.8"));