Overview
Comment: | Make it easier to change library version. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
dda573f0408bbb9ea70604b6a837b45c |
User & Date: | js on 2010-03-04 22:46:58 |
Other Links: | manifest | tags |
Context
2010-03-04
| ||
23:35 | Add "make tarball". check-in: 2267fd9439 user: js tags: trunk | |
22:46 | Make it easier to change library version. check-in: dda573f040 user: js tags: trunk | |
22:35 | Add .hgignore file. check-in: 081d33dbf0 user: js tags: trunk | |
Changes
Modified extra.mk.in from [f7d6b1cce7] to [f586e93b1d].
1 2 3 4 5 6 7 8 9 10 11 | 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@ | > > > > | 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 | PROG_NOINST = gen_tables${PROG_SUFFIX} SRCS = main.o \ TableGenerator.m .PHONY: run run: all UnicodeData.txt CaseFolding.txt | > > | > | | | | > > > | | 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.${OBJFW_LIB_MAJOR_MINOR} rm -f libobjfw.dll libobjfw.dylib if test -f ../src/libobjfw.so; then \ 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.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 | include ../extra.mk LIB = ${LIB_PREFIX}objfw${LIB_SUFFIX} | | | | 1 2 3 4 5 6 7 8 9 10 11 12 | include ../extra.mk LIB = ${LIB_PREFIX}objfw${LIB_SUFFIX} 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 | 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: | | > | | | | > > > | | 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.${OBJFW_LIB_MAJOR_MINOR} rm -f libobjfw.dll libobjfw.dylib if test -f ../src/libobjfw.so; then \ 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.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 |
︙ | ︙ |