Compare commits
20 Commits
Author | SHA256 | Date | |
---|---|---|---|
8a3862a434 | |||
eac636cab4 | |||
a990855870 | |||
1905965706 | |||
0784c02d59 | |||
d5b12ff18e | |||
a48e78d849 | |||
cc8b79bacc | |||
84fbaa9c7b | |||
e5a6b121a5 | |||
8375afbde8 | |||
ff8d85e2b5 | |||
15c3ab9e52 | |||
|
0a2d28036f | ||
|
6ad93b7111 | ||
|
062a3ab50b | ||
|
b42660491e | ||
|
877acc6010 | ||
|
7f274ea437 | ||
|
5c666370cf |
@@ -1,66 +0,0 @@
|
|||||||
--- libmatthew-java-0.8/cgi-java.c 2011-06-28 10:27:11.000000000 +0200
|
|
||||||
+++ libmatthew-java-0.8/cgi-java.c 2017-12-22 13:10:21.755868074 +0100
|
|
||||||
@@ -26,7 +26,10 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <jni.h>
|
|
||||||
-#include "cgi-java.h"
|
|
||||||
+#include "cx_ath_matthew_unix_UnixServerSocket.h"
|
|
||||||
+#include "cx_ath_matthew_unix_UnixSocket.h"
|
|
||||||
+#include "cx_ath_matthew_unix_USInputStream.h"
|
|
||||||
+#include "cx_ath_matthew_unix_USOutputStream.h"
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
--- libmatthew-java-0.8/Makefile 2011-01-23 18:09:41.000000000 +0100
|
|
||||||
+++ libmatthew-java-0.8/Makefile 2017-12-22 13:10:57.603868209 +0100
|
|
||||||
@@ -1,7 +1,6 @@
|
|
||||||
JAVAC?=javac
|
|
||||||
JAVADOC?=javadoc
|
|
||||||
JAR?=jar
|
|
||||||
-JAVAH?=javah
|
|
||||||
GCJ?=gcj
|
|
||||||
CC?=gcc
|
|
||||||
LD?=gcc
|
|
||||||
@@ -13,7 +12,7 @@
|
|
||||||
JVERCFLAGS+=-source 1.5
|
|
||||||
JCFLAGS+=
|
|
||||||
INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
|
|
||||||
-JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
|
|
||||||
+JAVADOCFLAGS?=-quiet -author
|
|
||||||
|
|
||||||
LDVER?=$(shell ld -v | cut -d' ' -f1)
|
|
||||||
UNAME?=$(shell uname -s)
|
|
||||||
@@ -50,7 +49,7 @@
|
|
||||||
.classes: $(SRC)
|
|
||||||
mkdir -p classes
|
|
||||||
$(MAKE) .$(DEBUG)debug
|
|
||||||
- $(JAVAC) $(JVERCFLAGS) $(JCFLAGS) -d classes -cp classes $^
|
|
||||||
+ $(JAVAC) $(JVERCFLAGS) $(JCFLAGS) -d classes -h . -cp classes $^
|
|
||||||
touch .classes
|
|
||||||
clean:
|
|
||||||
rm -rf classes doc
|
|
||||||
@@ -76,10 +75,10 @@
|
|
||||||
$(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $<
|
|
||||||
lib%.so: %.o
|
|
||||||
$(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $<
|
|
||||||
+
|
|
||||||
unix-java.h: .classes
|
|
||||||
- $(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream
|
|
||||||
+
|
|
||||||
cgi-java.h: .classes
|
|
||||||
- $(JAVAH) -classpath classes -o $@ cx.ath.matthew.cgi.CGI
|
|
||||||
|
|
||||||
test.cgi: cgi-$(CGIVER).jar libcgi-java.so
|
|
||||||
$(GCJ) $(GCJFLAGS) $(GCJJNIFLAG) -L. -lcgi-java -o test.cgi --main=cx.ath.matthew.cgi.testcgi cgi-$(CGIVER).jar
|
|
||||||
--- libmatthew-java-0.8/unix-java.c 2011-06-28 10:27:20.000000000 +0200
|
|
||||||
+++ libmatthew-java-0.8/unix-java.c 2017-12-22 13:10:16.323868053 +0100
|
|
||||||
@@ -29,7 +29,7 @@
|
|
||||||
/* _GNU_SOURCE is required to use struct ucred in glibc 2.8 */
|
|
||||||
#define _GNU_SOURCE
|
|
||||||
|
|
||||||
-#include "unix-java.h"
|
|
||||||
+#include "cx_ath_matthew_cgi_CGI.h"
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
|
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:05d1d3d9b5e33bd3642102aae10bba904e296c5c01a10854200ad4df349c8dfa
|
|
||||||
size 30749
|
|
Reference in New Issue
Block a user