pool/tanukiwrapper
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 390774 from home:dmacvicar:branches:Java:packages

Browse Source 
- update to version 3.5.29
- update to version 3.5.28
- removed not longer needed patches
  * tanukiwrapper-no-4g-mem-limit.patch
  * tanukiwrapper-makefile-linux-x86-64.patch
  * tanukiwrapper-makefile-linux-x86-64.patch
- Move from jpackage-utils to javapackages-tools
- aarch64 and ppc64le are 64bit 
- format specfile
- allow more than 4G as -Xmx option (bnc#914900)
  * add tanukiwrapper-no-4g-mem-limit.patch
- License: and Obsoletes: fields fixed 
- x86_64 Makefile fixed
- change rpm groups
- remove BuildRequires on javadoc. It should be part of the
  devel package which is already required.

- rebase on current upstream which builds on s390x

OBS-URL: https://build.opensuse.org/request/show/390774
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tanukiwrapper?expand=0&rev=20
This commit is contained in:
P. Janouch 2016-04-20 12:58:11 +00:00 committed by Git OBS Bridge
parent c473f96f04
commit 605d65665f
9 changed files with 463 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

222
tanukiwrapper-Makefiles.patch
View File

@ -1,222 +0,0 @@
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-aarch64-64.make wrapper_3.5.25_src/src/c/Makefile-linux-aarch64-64.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-aarch64-64.make 1970-01-01 01:00:00.000000000 +0100
+++ wrapper_3.5.25_src/src/c/Makefile-linux-aarch64-64.make 2014-08-04 10:37:49.921225870 +0200
@@ -0,0 +1,54 @@
+# Copyright (c) 1999, 2014 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+testsuite_SOURCE = testsuite.c test_example.c test_javaadditionalparam.c test_hashmap.c test_filter.c wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+BIN = ../../bin
+LIB = ../../lib
+TEST = ../../test
+
+all: init wrapper libwrapper.so testsuite
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm
+
+testsuite: $(testsuite_SOURCE)
+ $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-32.make wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-32.make 2014-08-04 10:24:24.465225966 +0200
+++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make 2014-08-04 10:36:01.561225883 +0200
@@ -33,7 +33,7 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
libwrapper.so: $(libwrapper_so_OBJECTS)
${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-64.make wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-64.make 2014-08-04 10:24:24.466225966 +0200
+++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make 2014-08-04 10:36:24.849225880 +0200
@@ -33,7 +33,7 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
libwrapper.so: $(libwrapper_so_OBJECTS)
${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-s390x-64.make wrapper_3.5.25_src/src/c/Makefile-linux-s390x-64.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-s390x-64.make 1970-01-01 01:00:00.000000000 +0100
+++ wrapper_3.5.25_src/src/c/Makefile-linux-s390x-64.make 2014-08-04 10:35:31.250225886 +0200
@@ -0,0 +1,54 @@
+# Copyright (c) 1999, 2014 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+testsuite_SOURCE = testsuite.c test_example.c test_javaadditionalparam.c test_hashmap.c test_filter.c wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+BIN = ../../bin
+LIB = ../../lib
+TEST = ../../test
+
+all: init wrapper libwrapper.so testsuite
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm
+
+testsuite: $(testsuite_SOURCE)
+ $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-s390-32.make wrapper_3.5.25_src/src/c/Makefile-linux-s390-32.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-s390-32.make 1970-01-01 01:00:00.000000000 +0100
+++ wrapper_3.5.25_src/src/c/Makefile-linux-s390-32.make 2014-08-04 10:34:57.675225890 +0200
@@ -0,0 +1,54 @@
+# Copyright (c) 1999, 2014 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+testsuite_SOURCE = testsuite.c test_example.c test_javaadditionalparam.c test_hashmap.c test_filter.c wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+BIN = ../../bin
+LIB = ../../lib
+TEST = ../../test
+
+all: init wrapper libwrapper.so
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm
+
+testsuite: $(testsuite_SOURCE)
+ $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-32.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-32.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-32.make 2014-08-04 10:24:24.467225966 +0200
+++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-32.make 2014-08-04 10:31:00.972225918 +0200
@@ -36,7 +36,7 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm
testsuite: $(testsuite_SOURCE)
$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-64.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-64.make 2014-08-04 10:24:24.466225966 +0200
+++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make 2014-08-04 10:31:00.972225918 +0200
@@ -36,7 +36,7 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm
testsuite: $(testsuite_SOURCE)
$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite

329
tanukiwrapper-additional-makefiles.patch Normal file
View File

@ -0,0 +1,329 @@
Description: linux makefiles for other architectures
--- /dev/null
+++ b/src/c/Makefile-linux-mips-32.make
@@ -0,0 +1,49 @@
+
+# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm $(LDFLAGS) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared $(libwrapper_so_OBJECTS) $(LDFLAGS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
--- /dev/null
+++ b/src/c/Makefile-linux-mipsel-32.make
@@ -0,0 +1,49 @@
+
+# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm $(LDFLAGS) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared $(libwrapper_so_OBJECTS) $(LDFLAGS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
--- /dev/null
+++ b/src/c/Makefile-linux-s390x-64.make
@@ -0,0 +1,49 @@
+
+# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+COMPILE = gcc -O3 -m64 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -pthread $(wrapper_SOURCE) $(LDFLAGS) -o $(BIN)/wrapper -lm
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared $(libwrapper_so_OBJECTS) $(LDFLAGS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
--- /dev/null
+++ b/src/c/Makefile-linux-sparc-32.make
@@ -0,0 +1,49 @@
+
+# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+COMPILE = gcc -O3 -m32 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -lm -pthread $(LDFLAGS) $(wrapper_SOURCE) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared $(LDFLAGS) $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
--- /dev/null
+++ b/src/c/Makefile-linux-sparc-64.make
@@ -0,0 +1,49 @@
+
+# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+COMPILE = gcc -O3 -m64 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -lm -pthread $(LDFLAGS) $(wrapper_SOURCE) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared $(LDFLAGS) $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
--- /dev/null
+++ b/src/c/Makefile-linux-aarch64-64.make
@@ -0,0 +1,49 @@
+
+# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm $(LDFLAGS) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared $(libwrapper_so_OBJECTS) $(LDFLAGS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
--- a/src/c/Makefile-linux-ppc64le-64.make
+++ b/src/c/Makefile-linux-ppc64le-64.make
@@ -33,10 +33,10 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ $(COMPILE) -pthread $(wrapper_SOURCE) $(LDFLAGS) -o $(BIN)/wrapper -lm
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} -shared $(libwrapper_so_OBJECTS) $(LDFLAGS) -o $(LIB)/libwrapper.so
%.o: %.c
@echo '$(COMPILE) -c $<'; \

10
tanukiwrapper-build.patch
View File

@ -1,10 +0,0 @@
--- build.xml~ 2006-03-01 05:34:34.000000000 +0200
+++ build.xml 2006-05-09 11:15:33.000000000 +0300
@@ -294,2 +294,3 @@
<target name="convert" depends="init:msg, init:java-missing">
+ <!-- No-op, but prevents build using ant-nodeps built with non-Sun JDK :(
<native2ascii src="${src.dir}/java"
@@ -299,2 +300,3 @@
includes="**/*.native" />
+ -->
</target>

37
tanukiwrapper-ppc64le.patch
View File

@ -1,37 +0,0 @@
diff -urN wrapper_3.5.25_src.old/build.xml wrapper_3.5.25_src/build.xml
--- wrapper_3.5.25_src.old/build.xml 2014-08-04 10:24:24.463225966 +0200
+++ wrapper_3.5.25_src/build.xml 2014-08-04 10:39:44.065225856 +0200
@@ -133,6 +133,7 @@
<equals arg1="${os.arch}" arg2="Power"/>
<equals arg1="${os.arch}" arg2="PowerPC"/>
<equals arg1="${os.arch}" arg2="ppc64"/>
+ <equals arg1="${os.arch}" arg2="ppc64le"/>
</or>
</condition>
<condition property="dist.arch" value="parisc">
diff -urN wrapper_3.5.25_src.old/src/bin/sh.script.in wrapper_3.5.25_src/src/bin/sh.script.in
--- wrapper_3.5.25_src.old/src/bin/sh.script.in 2014-08-04 10:24:24.467225966 +0200
+++ wrapper_3.5.25_src/src/bin/sh.script.in 2014-08-04 10:42:02.583225840 +0200
@@ -347,8 +347,8 @@
DIST_ARCH="mips"
DIST_BITS="32"
;;
- 'power' | 'powerpc' | 'power_pc' | 'ppc64')
- if [ "${DIST_ARCH}" = "ppc64" ] ; then
+ 'power' | 'powerpc' | 'power_pc' | 'ppc64' | 'ppc64le' )
+ if [ "${DIST_ARCH}" = "ppc64" -o "${DIST_ARCH}" = 'ppc64le' ] ; then
DIST_BITS="64"
else
DIST_BITS="32"
diff -urN wrapper_3.5.25_src.old/src/java/org/tanukisoftware/wrapper/WrapperManager.java wrapper_3.5.25_src/src/java/org/tanukisoftware/wrapper/WrapperManager.java
--- wrapper_3.5.25_src.old/src/java/org/tanukisoftware/wrapper/WrapperManager.java 2014-08-04 10:24:24.464225966 +0200
+++ wrapper_3.5.25_src/src/java/org/tanukisoftware/wrapper/WrapperManager.java 2014-08-04 10:42:47.616225834 +0200
@@ -1408,7 +1408,7 @@
{
arch = "sparc";
}
- else if ( arch.equals( "power" ) || arch.equals( "powerpc" ) || arch.equals( "ppc64" ) )
+ else if ( arch.equals( "power" ) || arch.equals( "powerpc" ) || arch.startsWith( "ppc64" ) )
{
arch = "ppc";
}

65
tanukiwrapper.changes
View File

@ -1,64 +1,59 @@
-------------------------------------------------------------------
Mon Aug 4 08:46:11 UTC 2014 - tchvatal@suse.com
Wed Apr 20 08:19:37 UTC 2016 - dmacvicar@suse.de
- Version bump to 3.5.25:
* Updating to latest upstream version
* Javadoc is gone from the tarball
* 8 years worth of developement, read revisions.txt in docs
- Cleanup the patches and merge all the makefile ones to one patch:
* tanukiwrapper-Makefiles.patch
* Removed patches:
+ tanukiwrapper-Makefile-s390-s390x-ppc.patch
+ tanukiwrapper-Makefile-aarch64.patch
+ tanukiwrapper-makefile-linux-x86-32.patch
- Remove patch that breaks build:
* tanukiwrapper-crosslink.patch
- Refreshed patches
* tanukiwrapper-ppc64le.patch
- update to version 3.5.29
-------------------------------------------------------------------
Fri Aug 1 21:44:14 UTC 2014 - dvlaeev@suse.com
Wed Apr 6 22:57:23 UTC 2016 - dmacvicar@suse.de
- Fix ppc64le build
- update to version 3.5.28
- removed not longer needed patches
* tanukiwrapper-no-4g-mem-limit.patch
* tanukiwrapper-makefile-linux-x86-64.patch
* tanukiwrapper-makefile-linux-x86-64.patch
- Move from jpackage-utils to javapackages-tools
-------------------------------------------------------------------
Tue Jul 8 10:52:25 UTC 2014 - tchvatal@suse.com
Wed Oct 14 01:55:04 CEST 2015 - ro@suse.de
- Do not depend on ant-nodeps.
- aarch64 and ppc64le are 64bit
-------------------------------------------------------------------
Mon Jul 7 15:07:30 UTC 2014 - tchvatal@suse.com
Mon Oct 12 10:57:32 CEST 2015 - mc@suse.de
- Use junit not junit4 dep.
- format specfile
-------------------------------------------------------------------
Fri Sep 13 10:53:29 UTC 2013 - mvyskocil@suse.com
Fri Jan 30 09:37:51 UTC 2015 - dmacvicar@suse.de
- build with junit4
- fix Group tags
- allow more than 4G as -Xmx option (bnc#914900)
* add tanukiwrapper-no-4g-mem-limit.patch
-------------------------------------------------------------------
Mon Sep 9 11:06:23 UTC 2013 - tchvatal@suse.com
Thu Jun 26 14:50:09 UTC 2014 - smoioli@suse.com
- Move from jpackage-utils to javapackage-tools
- License: and Obsoletes: fields fixed
-------------------------------------------------------------------
Sun Aug 18 17:45:01 UTC 2013 - schwab@suse.de
Thu Jun 26 14:42:42 UTC 2014 - smoioli@suse.com
- Add aarch64 to the list of 64-bit architectures
- tanukiwrapper-Makefile-aarch64.patch: add makefile for aarch64
- x86_64 Makefile fixed
-------------------------------------------------------------------
Fri Dec 28 22:22:19 UTC 2012 - dvaleev@suse.com
Tue Dec 17 17:34:38 CET 2013 - mc@suse.de
- update tanukiwrapper-Makefile-s390-s390x-ppc.patch to cover ppc64
as well.
- build with asneeded
- change rpm groups
-------------------------------------------------------------------
Mon Jun 25 09:17:13 UTC 2012 - mvyskocil@suse.cz
Tue Sep 24 12:32:40 CEST 2013 - mc@suse.de
- fix a license Tag (MIT), use non-versioned jar and javadoc dir
- remove BuildRequires on javadoc. It should be part of the
devel package which is already required.
-------------------------------------------------------------------
Tue Jun 25 08:19:24 UTC 2013 - dmacvicar@suse.de
- rebase on current upstream which builds on s390x
-------------------------------------------------------------------
Tue Sep 29 12:39:17 UTC 2009 - mvyskocil@suse.cz

114
tanukiwrapper.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package tanukiwrapper
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2006, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@ -18,25 +18,23 @@
Name: tanukiwrapper
Version: 3.5.25
Release: 0
Version: 3.5.29
Release: 0.<RELEASE2>
Summary: Java Service Wrapper
License: MIT
Group: Development/Libraries/Java
License: GPL-2.0
Group: Development/Languages/Java
Url: http://wrapper.tanukisoftware.org/
Source0: http://download.sourceforge.net/wrapper/wrapper_%{version}_src.tar.gz
Patch1: %{name}-build.patch
Patch3: %{name}-Makefiles.patch
Patch7: tanukiwrapper-ppc64le.patch
Source1: wrapper.1
Patch0: %{name}-additional-makefiles.patch
BuildRequires: ant >= 1.6.1
BuildRequires: ant-junit
BuildRequires: ant-nodeps >= 1.6.1
BuildRequires: cunit-devel
BuildRequires: glibc-devel
BuildRequires: java-devel
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: perl
BuildRequires: unzip
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
Requires: javapackages-tools
@ -54,72 +52,88 @@ common to many Java applications:
- Ease Application installations
- Logging
%package javadoc
Summary: Javadoc documentation for %{name}
Group: Documentation/Other
# For /bin/rm and /bin/ln
Requires(post): coreutils
Requires(postun): coreutils
%description javadoc
This package contains the javadoc documentation for %{name}
%package manual
Summary: Documents for %{name}
Summary: Manuals for %{name}
Group: Documentation/Other
%description manual
The Java Service Wrapper is an application which has
evolved out of a desire to solve a number of problems
common to many Java applications:
- Run as a Windows Service or Unix Daemon
- Application Reliability
- Standard, Out of the Box Scripting
- On Demand Restarts
- Flexible Configuration
- Ease Application installations
- Logging
This package contains the manuals for %{name}
%prep
%setup -q -n wrapper_%{version}_src
%patch1
%patch3 -p1
%patch7 -p1
%patch0 -p1
find . -name "*.jar" -exec rm -f {} \;
perl -p -i -e 's/\r//' doc/AUTHORS
perl -p -i -e 's|-O3|%{optflags}|' src/c/Makefile*
perl -p -e \
's|=\.\./lib/wrapper\.jar$|=%{_javadir}/%{name}.jar| ;
s|=\.\./lib$|=%{_libdir}|' \
src/conf/wrapper.conf.in > wrapper.conf.sample
perl -p -e \
's|"\./wrapper"|"%{_sbindir}/%{name}"| ;
s|"\.\./conf/wrapper\.conf"|"/path/to/wrapper.conf"|' \
src/bin/sh.script.in > script.sh.sample
rm -f bin/* build/* conf/* lib/* logs/* test/* src/c/*.o src/c/wrapperinfo.c
%build
export CLASSPATH=$(build-classpath ant junit xerces-j2 xml-commons-apis)
%ifarch x86_64 ia64 ppc64 ppc64le sparc64 s390x aarch64
bits=64
%else
bits=32
%endif
ant -Dbuild.sysclasspath=first -Djdk.api=%{_javadocdir}/java -Dbits=$bits \
main
%{ant} -Dbuild.sysclasspath=first -Dbits=%{__isa_bits}
%{javadoc} -sourcepath src/java -d build/javadoc org.tanukisoftware.wrapper
%install
# jar
mkdir -p %{buildroot}%{_javadir}
install -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}.jar
%{__mkdir} -p %{buildroot}%{_javadir}
%{__install} -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# jni
install -d -m 755 %{buildroot}%{_libdir}
install -p -m 755 lib/libwrapper.so %{buildroot}%{_libdir}
%{__install} -d -m 755 %{buildroot}%{_libdir}
%{__install} -p -m 755 lib/libwrapper.so %{buildroot}%{_libdir}
# commands
install -d -m 755 %{buildroot}%{_sbindir}
install -p -m 755 bin/wrapper %{buildroot}%{_sbindir}/%{name}
%{__install} -d -m 755 %{buildroot}%{_sbindir}
%{__install} -p -m 755 bin/wrapper %{buildroot}%{_sbindir}/%{name}
# javadoc
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -a build/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
# manpage
%{__mkdir_p} %{buildroot}%{_mandir}/man1
%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1
%check
%{ant} -Dbuild.sysclasspath=first -Dbits=%{__isa_bits} test
%post javadoc
rm -rf %{_javadocdir}/%{name}
%{__ln_s} -f %{name}-%{version} %{_javadocdir}/%{name}
%postun javadoc
if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/%{name}
fi
%files
%defattr(-,root,root,-)
%doc doc/wrapper-community-license-1.1.txt
%doc doc/wrapper-community-license-1.3.txt
%{_sbindir}/%{name}
%{_libdir}/libwrapper.so
%{_javadir}/%{name}.jar
%{_javadir}/%{name}*.jar
%{_mandir}/man1/%{name}.1.*
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}
%files manual
%defattr(0644,root,root,0755)
%doc doc/wrapper-community-license-1.1.txt *.sample
%doc doc/*
%changelog

37
wrapper.1 Normal file
View File

@ -0,0 +1,37 @@
.TH javawrapper 1 "12/24/2012"
.SH NAME
wrapper \- Jar daemon wrapper
.SH USAGE
\fBwrapper\fP [\f[I]<command>\f[]] [\f[I]<configuration file>\f[]] [\f[I]<configuration properties>]\f[]
where <command> can be one of:
.TP
.B -c --console
run as a Console application
.TP
.B -v --version
print the wrapper's version information.
.TP
.B -? --help
print this help message
.TP
.B -- <args>
mark the end of Wrapper arguments. All arguments after the '--' will be passed through unmodified to the java application.
.TP
<configuration file> is the wrapper.conf to use. The filename must either be absolute or relative to the location of \fBwrapper\fP
.TP
\f[I]<configuration properties>\f[] are configuration name-value pairs which override values in wrapper.conf. For example:
wrapper.debug=true
.TP
Please note that any file references must be either absolute or relative to the location of the wrapper executable.
.PP
This manual page was written by Rémi Debay <debay.remi@gmail.com>
and Kill Your TV <killyourtv@i2pmail.org>.

3
wrapper_3.5.25_src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cbecb7f2101eda82125e3649e3245fc1e7b4b4d6501b479990ea8b18ac6450b
size 556678

3
wrapper_3.5.29_src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:828875f246df05c4328bc13087f82c388a61d1f2ebad707951bdca5165c81b28
size 611760