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

Timestamp:

2010-10-18T11:25:46+13:00 (14 years ago)

Author:

sjm84

Message:

Added an LD_LIBRARY_PATH pointing to the gnome-lib lib directory for the compiling stage of the release kit

File:

• main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml (modified) (4 diffs)

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

@@ -49 +49 @@
         </if>
 
-        <!-- mac or linux: compile the support library -->
+        <!-- mac or linux: get the support library -->
         <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
             <!-- checkout the gnome support library extension-->
@@ -65 +65 @@
                 </exec>
 
-                <exec executable="/bin/tar" dir="${basedir}/compiled/ext">
+                <exec executable="tar" dir="${basedir}/compiled/ext">
                     <arg value="xvzf"/>
                     <arg value="gnome-lib-${os.shell}.tar.gz"/>
@@ -178 +178 @@
                 <arg line="CXXFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib/linux/include&quot;"/>
                 <arg line="LDFLAGS=&quot;-static -L${basedir}/compiled/ext/gnome-lib/linux/lib&quot;"/>
+                <arg line="PKG_CONFIG_PATH=&quot;${basedir}/compiled/ext/gnome-lib/linux/lib/pkgconfig&quot;"/>
             </exec>
 
@@ -205 +206 @@
         <!-- 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 key="libpathvar" value="DYLD_LIBRARY_PATH"/>
+            <else>
+                <property key="libpathvar" value="LD_LIBRARY_PATH"/>
+            </else>
+            </if>
+
             <!-- make -->
-            <exec dir="${basedir}/compiled" executable="make" failonerror="true"/>
+            <exec dir="${basedir}/compiled" executable="make" failonerror="true">
+                <arg line="${libpathvar}=&quot;${basedir}/compiled/ext/gnome-lib/linux/lib&quot;"/>
+            </exec>
 
             <!-- make install -->