Overview
Context
Changes
Modified extra.mk.in
from [f7d6b1cce7]
to [f586e93b1d].
1
2
3
4
5
6
7
8
9
10
11
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
+
+
+
+
|
OBJFW_LIB_MAJOR = 2
OBJFW_LIB_MINOR = 0
OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}
ASPRINTF_M = @ASPRINTF_M@
ATOMIC_H = @ATOMIC_H@
OBJC_PROPERTIES_M = @OBJC_PROPERTIES_M@
OBJC_SYNC_M = @OBJC_SYNC_M@
OFPLUGIN_M = @OFPLUGIN_M@
OFTHREAD_M = @OFTHREAD_M@
PROPERTIES_M = @PROPERTIES_M@
TESTPLUGIN = @TESTPLUGIN@
TESTS = @TESTS@
TEST_LAUNCHER = @TEST_LAUNCHER@
THREADING_H = @THREADING_H@
|
| | | |
Modified generators/Makefile
from [286af8b6ae]
to [e6f92c1afe].
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
+
+
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
|
include ../extra.mk
PROG_NOINST = gen_tables${PROG_SUFFIX}
SRCS = main.o \
TableGenerator.m
.PHONY: run
run: all UnicodeData.txt CaseFolding.txt
rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib
rm -f libobjfw.so.1 libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
rm -f libobjfw.dll libobjfw.dylib
if test -f ../src/libobjfw.so; then \
ln -s ../src/libobjfw.so libobjfw.so.1; \
ln -s ../src/libobjfw.so libobjfw.so.1.0; \
elif test -f ../src/libobjfw.so.1.0; then \
ln -s ../src/libobjfw.so.1.0 libobjfw.so.1.0; \
ln -s ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \
ln -s ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
elif test -f ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; then \
ln -s ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} \
libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
fi
if test -f ../src/libobjfw.dll; then \
ln ../src/libobjfw.dll libobjfw.dll; \
fi
if test -f ../src/libobjfw.dylib; then \
ln -s ../src/libobjfw.dylib libobjfw.dylib; \
fi
echo "Generating tables..."
LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} libobjfw.dll \
rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
rm -f libobjfw.dylib; \
exit $$EXIT
UnicodeData.txt:
wget http://unicode.org/Public/UNIDATA/UnicodeData.txt
CaseFolding.txt:
wget http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
include ../buildsys.mk
CPPFLAGS += -I../src -I..
LIBS := -L../src -lobjfw ${LIBS}
LD = ${OBJC}
|
| |
Modified src/Makefile
from [3a32fe0336]
to [a3554db11b].
1
2
3
4
5
6
7
8
9
10
11
12
|
1
2
3
4
5
6
7
8
9
10
11
12
|
-
-
+
+
|
include ../extra.mk
LIB = ${LIB_PREFIX}objfw${LIB_SUFFIX}
LIB_MAJOR = 1
LIB_MINOR = 0
LIB_MAJOR = ${OBJFW_LIB_MAJOR}
LIB_MINOR = ${OBJFW_LIB_MINOR}
SRCS = OFArray.m \
OFAutoreleasePool.m \
OFConstString.m \
OFDataArray.m \
OFDictionary.m \
OFExceptions.m \
|
︙ | | |
Modified tests/Makefile
from [dfcf866346]
to [d8581cadf1].
︙ | | |
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
|
IPHONE_TMP = /tmp/objfw-test
.PHONY: run run-tests run-on-iphone
run: all
if [ -z "${DONT_RUN_TESTS}" ]; then ${MAKE} ${MFLAGS} run-tests; fi
run-tests:
rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib
rm -f libobjfw.so.1 libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
rm -f libobjfw.dll libobjfw.dylib
if test -f ../src/libobjfw.so; then \
ln -s ../src/libobjfw.so libobjfw.so.1; \
ln -s ../src/libobjfw.so libobjfw.so.1.0; \
elif test -f ../src/libobjfw.so.1.0; then \
ln -s ../src/libobjfw.so.1.0 libobjfw.so.1.0; \
ln -s ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \
ln -s ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
elif test -f ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; then \
ln -s ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} \
libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
fi
if test -f ../src/libobjfw.dll; then \
ln ../src/libobjfw.dll libobjfw.dll; \
fi
if test -f ../src/libobjfw.dylib; then \
ln -s ../src/libobjfw.dylib libobjfw.dylib; \
fi
LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} libobjfw.dll \
rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
rm -f libobjfw.dylib; \
exit $$EXIT
run-on-iphone: all
if [ -z "${IPHONE_HOST}" ]; then \
echo "Please set IPHONE_HOST to the hostname of your iPhone!"; \
exit 1; \
fi
|
︙ | | |