gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-25 21:08:35 -07:00
Code Issues Projects Releases Wiki Activity

dev-java/java-service-wrapper: Clean up old.

Browse Source 
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
Patrice Clement
2015-10-16 15:06:05 +00:00
parent 3c4ccb1a91
commit 01bc227730
7 changed files with 0 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch
View File

@@ -1,53 +0,0 @@
--- build.xml 2008-02-24 20:10:00.000000000 +1300
+++ build.xml 2008-02-24 20:17:10.000000000 +1300
@@ -397,16 +397,6 @@
<classpath refid="project.class.path"/>
</javac>
- <!-- compile everything under src/test -->
- <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
- deprecation="on"
- debug="on"
- optimize="on"
- source="${javac.target.version}"
- target="${javac.target.version}">
- <classpath refid="test.class.path"/>
- </javac>
-
<!-- copy resource files to build directory -->
<copy todir="${build.classes}" >
<fileset dir="${src.dir}/java" >
@@ -430,6 +420,24 @@
<class name="org.tanukisoftware.wrapper.WrapperManager"/>
</javah>
</target>
+
+ <target name="compile-test" depends="compile-java-warn">
+ <!-- compile everything under src/test -->
+ <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
+ deprecation="on"
+ debug="on"
+ optimize="on"
+ source="${javac.target.version}"
+ target="${javac.target.version}">
+ <classpath refid="test.class.path"/>
+ <classpath>
+ <fileset dir="lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
+ </target>
+
<target name="msvc-missing" depends="init:msg" if="msvc.missing">
<condition property="msvc.home.v8_c" value="${msvc.home.v8_64_c}">
<equals arg1="${bits}" arg2="64"/>
@@ -636,7 +644,7 @@
<!-- =================================================================== -->
<!-- Test Task -->
<!-- =================================================================== -->
- <target name="test" depends="jar" description="Runs unit tests">
+ <target name="test" depends="compile-test,jar" description="Runs unit tests">
<mkdir dir="${build.tests}"/>
<junit fork="true"

62
dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
View File

@@ -1,62 +0,0 @@
diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make
--- wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make 2008-08-17 10:40:04.000000000 +0300
+++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make 2008-11-16 17:31:47.000000000 +0200
@@ -7,7 +7,7 @@
# license agreement you entered into with Tanuki Software.
# http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
-COMPILE = gcc -O3 -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
+COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64
INCLUDE=$(JAVA_HOME)/include
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -lm -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
%.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \
+ $(COMPILE) $(CFLAGS) $(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/$$/ :/' \
diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make
--- wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make 2008-08-17 10:40:04.000000000 +0300
+++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make 2008-11-16 17:31:54.000000000 +0200
@@ -7,7 +7,7 @@
# license agreement you entered into with Tanuki Software.
# http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
+COMPILE = $(CC) -fPIC -DLINUX -D_FILE_OFFSET_BITS=64
INCLUDE=$(JAVA_HOME)/include
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
%.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \
+ $(COMPILE) $(CFLAGS) $(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/$$/ :/' \

62
dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
View File

@@ -1,62 +0,0 @@
diff -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make
--- wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make 2012-02-08 21:14:51.000000000 +1300
+++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make 2012-04-18 23:47:55.000000000 +1200
@@ -7,7 +7,7 @@
# 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
+COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
INCLUDE=$(JAVA_HOME)/include
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
%.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \
+ $(COMPILE) $(CFLAGS) $(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/$$/ :/' \
diff -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make
--- wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make 2012-02-08 21:14:51.000000000 +1300
+++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make 2012-04-18 23:50:06.000000000 +1200
@@ -7,7 +7,7 @@
# 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
+COMPILE = $(CC) -fPIC -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
INCLUDE=$(JAVA_HOME)/include
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
%.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \
+ $(COMPILE) $(CFLAGS) $(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/$$/ :/' \

22
dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch
View File

@@ -1,22 +0,0 @@
Author: Ralph Sennhauser <sera@gentoo.org>
Added in 3.5.4, make false default for Gentoo
* Add a new wrapper.java.command.resolve property to control whether or not the
Wrapper tries to resolve any symbolic links in the Java command, specified
with the wrapper.java.command property. Historically, it has always done so,
but some jvm started applications like run-java-tool on Gentoo will fail if
it is run directly as they have a check to make sure it is launched via a
symbolic link.
--- a/src/c/wrapper.c
+++ b/src/c/wrapper.c
@@ -4664,7 +4664,7 @@ void checkIfRegularExe(TCHAR** para) {
if (!path) {
log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
} else {
- replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE, TRUE);
+ replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE, TRUE);
if (replacePath == TRUE) {
free(*para);
*para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));