[sword-svn] r3836 - in trunk: . bindings/Android bindings/Android/SWORD/app/src/main/cpp doc src/utilfuns

[scribe at crosswire.org]

Author: scribe
Date: 2020-12-26 13:09:35 -0500 (Sat, 26 Dec 2020)
New Revision: 3836

Removed:
   trunk/src/utilfuns/zlib/
Modified:
   trunk/CMakeLists.txt
   trunk/bindings/Android/Makefile
   trunk/bindings/Android/SWORD/app/src/main/cpp/CMakeLists.txt
   trunk/doc/Doxyfile
   trunk/src/utilfuns/Makefile.am
Log:
First cut to remove internal copy of old zlib code.



Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2020-12-26 18:05:05 UTC (rev 3835)
+++ trunk/CMakeLists.txt	2020-12-26 18:09:35 UTC (rev 3836)
@@ -13,7 +13,7 @@
 # not, then this file is released under the GPLv2 by myself.
 PROJECT(libsword CXX C)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
-SET(SWORD_VERSION 1.9.0)
+SET(SWORD_VERSION 1.9.0.svnversion)
 
 # Make sure it's an out-of-stream build
 IF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})

Modified: trunk/bindings/Android/Makefile
===================================================================
--- trunk/bindings/Android/Makefile	2020-12-26 18:05:05 UTC (rev 3835)
+++ trunk/bindings/Android/Makefile	2020-12-26 18:09:35 UTC (rev 3836)
@@ -5,8 +5,8 @@
 
 debug: javawrapper
 	rm -rf ../cordova/cordova-plugin-crosswire-sword/libs/android/*
-#	cp -a SWORD/app/build/intermediates/cmake/release/obj/* ../cordova/cordova-plugin-crosswire-sword/libs/android/
 	cp -a SWORD/app/build/intermediates/stripped_native_libs/debug/out/lib/* ../cordova/cordova-plugin-crosswire-sword/libs/android/
+#	cp -a SWORD/app/build/intermediates/merged_native_libs/debug/out/lib/* ../cordova/cordova-plugin-crosswire-sword/libs/android/
 
 javawrapper:
 	cp -a SWORD/app/src/main/java/org/crosswire/android/sword/* ../cordova/cordova-plugin-crosswire-sword/src/android/

Modified: trunk/bindings/Android/SWORD/app/src/main/cpp/CMakeLists.txt
===================================================================
--- trunk/bindings/Android/SWORD/app/src/main/cpp/CMakeLists.txt	2020-12-26 18:05:05 UTC (rev 3835)
+++ trunk/bindings/Android/SWORD/app/src/main/cpp/CMakeLists.txt	2020-12-26 18:09:35 UTC (rev 3836)
@@ -187,7 +187,6 @@
         keys/listkey.cpp
         frontend/swdisp.cpp
         frontend/swlog.cpp
-        utilfuns/zlib/untgz.c
 
         biblesync/biblesync.cc
         biblesync/Android/ifaddrs.c

Modified: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile	2020-12-26 18:05:05 UTC (rev 3835)
+++ trunk/doc/Doxyfile	2020-12-26 18:09:35 UTC (rev 3836)
@@ -55,7 +55,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER = "1.9.0"
+PROJECT_NUMBER = "1.9.0.svnversion"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

Modified: trunk/src/utilfuns/Makefile.am
===================================================================
--- trunk/src/utilfuns/Makefile.am	2020-12-26 18:05:05 UTC (rev 3835)
+++ trunk/src/utilfuns/Makefile.am	2020-12-26 18:09:35 UTC (rev 3836)
@@ -19,13 +19,6 @@
 ftpsrc =
 endif
 
-if HAVE_LIBZ
-UNTGZ = $(utilfunsdir)/zlib/untgz.c
-else
-UNTGZ =
-endif
-
-libsword_la_SOURCES += $(UNTGZ) 
 libsword_la_SOURCES += $(ftpsrc)
 
 if USE_INTERNAL_REGEX