Changeset 23609 for main/trunk/release-kits/kits/rk2

Timestamp:

2011-01-19T10:06:54+13:00 (13 years ago)

Author:

sjm84

Message:

Refactored some of the compile.xml and made some minor fixes

Location:

main/trunk/release-kits/kits/rk2/ant-scripts

Files:

• compile.xml (modified) (4 diffs)
• components.xml (modified) (1 diff)
• create-components.xml (modified) (2 diffs)

main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

@@ -74 +74 @@
             </if>
         </if>
+
+        <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
+            <!-- LD_LIBRARY_PATH is DYLD_LIBRARY_PATH on mac-->
+            <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+                <property name="libpathvar" value="DYLD_LIBRARY_PATH"/>
+            <else>
+                <property name="libpathvar" value="LD_LIBRARY_PATH"/>
+            </else>
+            </if>
+
+            <property name="gnome.lib.dir" value="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}"/>
+            <property name="path.arg" value="PATH=&quot;${gnome.lib.dir}/bin:${env.PATH}&quot;"/>
+            <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
+            <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
+            <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
+            <property name="ldflags.arg" value="LDFLAGS=&quot;-L${gnome.lib.dir}/lib&quot;"/>
+            <property name="pcpath.arg" value="PKG_CONFIG_PATH=&quot;${gnome.lib.dir}/lib/pkgconfig&quot;"/>
+            <property name="ldlpath.arg" value="${libpathvar}=&quot;${gnome.lib.dir}/lib&quot;"/>
+
+            <property name="allargs" value="${path.arg} ${cflags.arg} ${cxxflags.arg} ${cppflags.arg} ${ldflags.arg} ${pcpath.arg} ${ldlpath.arg}"/>
+        </if>   
         
         <!-- windows only -->
@@ -170 +191 @@
             <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true">
                 <arg line="--enable-apache-httpd"/>
-                <arg line="PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/linux/bin:${env.PATH}&quot;"/>
-                <arg line="CFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/linux/include&quot;"/>
-                <arg line="CPPFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/linux/include&quot;"/>
-                <arg line="CXXFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/linux/include&quot;"/>
-                <arg line="LDFLAGS=&quot;-static -L${basedir}/compiled/ext/gnome-lib-minimal/linux/lib&quot;"/>
-                <arg line="PKG_CONFIG_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/linux/lib/pkgconfig&quot;"/>
-                <arg line="LD_LIBRARY_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/linux/lib&quot;"/>
+                <arg line="${allargs}"/>
             </exec>
 
@@ -189 +204 @@
             <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true">
                 <arg line="--enable-apache-httpd"/>
-                <arg line="PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/darwin/bin:${env.PATH}&quot;"/>
-                <arg line="CFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include&quot;"/>
-                <arg line="CPPFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include&quot;"/>
-                <arg line="CXXFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include&quot;"/>
-                <arg line="LDFLAGS=&quot;-L${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib&quot;"/>
-                <arg line="PKG_CONFIG_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib/pkgconfig&quot;"/>
-                <arg line="DYLD_LIBRARY_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib&quot;"/>
+                <arg line="${allargs}"/>
             </exec>
 
@@ -206 +215 @@
         <!-- mac and linux: compile -->
         <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
-            <!-- LD_LIBRARY_PATH is DYLD_LIBRARY_PATH on mac-->
-            <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
-                <property name="libpathvar" value="DYLD_LIBRARY_PATH"/>
-            <else>
-                <property name="libpathvar" value="LD_LIBRARY_PATH"/>
-            </else>
-            </if>
-
             <!-- make -->
             <exec dir="${basedir}/compiled" executable="make" failonerror="true">
-                <arg line="${libpathvar}=&quot;${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}/lib&quot;"/>
+                <arg line="${ldlpath.arg}"/>
             </exec>
 

main/trunk/release-kits/kits/rk2/ant-scripts/components.xml

@@ -57 +57 @@
     </invert>
   </patternset>
+
+  <!-- the core component - defined by antithesis -->
+  <patternset id="greenstone2.core-x64.component">
+    <invert>
+      <patternset refid="greenstone2.source.component"/>
+      <patternset refid="greenstone2.imagemagick-x64.component"/>
+      <patternset refid="greenstone2.ghostscript.component"/>
+      <patternset refid="greenstone2.apachehttpd.component"/>
+    </invert>
+  </patternset>
 </project>
 

main/trunk/release-kits/kits/rk2/ant-scripts/create-components.xml

@@ -7 +7 @@
         <antcall target="create-component">
             <param name="component" value="imagemagick"/>
-            <param name="ext-x64" value="-x64"/>
+            <param name="ext-x64" value="${extension-x64}"/>
         </antcall>
 
@@ -28 +28 @@
         <antcall target="create-component">
             <param name="component" value="core"/>
-            <param name="ext-x64" value=""/>
+            <param name="ext-x64" value="${extension-x64}"/>
         </antcall>