Changeset 37453

Timestamp:

2023-03-10T21:18:43+13:00 (11 days ago)

Author:

anupama

Message:

1. Wno_error still in the release-kit compile.xml because I can't locate where fPIC is generally set in CFLAGS during GS3 compilation (whether release-kits or not), to add this to that flag in the same location. 2. Minor capitalization in monterey-compile.xml for rk3. Will remove monterey and mojave-compile.xml after confirming the nightlies on Mac generate binaries, generate working binaries and that they generate binaries that work through all the tutorials.

Location:

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

Files:

• compile.xml (modified) (1 diff)
• monterey-compile.xml (modified) (1 diff)

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

@@ -99 +99 @@
 
         <!-- <rsr file="${basedir}/compiled/build.xml" pattern="CFLAGS=&amp;quot;" replacement="CFLAGS=&amp;quot;-fPIC "/> -->
-        <rsr file="${basedir}/compiled/build.xml" pattern="CFLAGS=&amp;quot;" replacement="CFLAGS=&amp;quot;-Wno-error=implicit-function-declaration "/>
+        <!-- mac only: make errors about missing extern declarations back into warnings as in old (Mojave and before) macs -->
+        <if>
+          <bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+          <rsr file="${basedir}/compiled/build.xml" pattern="CFLAGS=&amp;quot;" replacement="CFLAGS=&amp;quot;-Wno-error=implicit-function-declaration "/>
+        </if>
         
         <!-- run greenstone3's ant install and ant dist-tidy -->

main/trunk/release-kits/kits/rk3/ant-scripts/monterey-compile.xml

@@ -13 +13 @@
         </exec>
 
-        <!-- comment out any active checkout.gnomelib.ext=true line in build.properties.svn
+        <!-- Comment out any active checkout.gnomelib.ext=true line in build.properties.svn
              So that the release-kits go back to behaving how they did when the line 
              used to be commented out by default in build properties.