From: <kkk...@us...> - 2009-10-31 10:20:57
|
Revision: 711 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=711&view=rev Author: kkkvadim Date: 2009-10-31 10:20:44 +0000 (Sat, 31 Oct 2009) Log Message: ----------- - cd $(nativePaths(SRCDIR + '/runtime')) && $(nativePaths(os.path.abspath(os.path.dirname(OUTPUT_FILE)) + '/' + BUILDDIR + '/mmex_tests' + EXEEXT)) + cd $(nativePaths(SRCDIR + '/runtime')) && $('..\\build\\msw\\tests\\' + BUILDDIR + '\\mmex_tests' + EXEEXT) Modified Paths: -------------- trunk/mmex/build/msw/tests/makefile.bcc trunk/mmex/build/msw/tests/makefile.gcc trunk/mmex/build/msw/tests/makefile.vc trunk/mmex/src/tests/Makefile.in trunk/mmex/src/tests/mmex_tests.bkl Modified: trunk/mmex/build/msw/tests/makefile.bcc =================================================================== --- trunk/mmex/build/msw/tests/makefile.bcc 2009-10-31 09:47:59 UTC (rev 710) +++ trunk/mmex/build/msw/tests/makefile.bcc 2009-10-31 10:20:44 UTC (rev 711) @@ -120,6 +120,24 @@ WX3RDPARTYLIBPOSTFIX = h !endif !if "$(TARGET_CPU)" == "AMD64" +TARGETCPUPOSTFIX = -x64 +!endif +!if "$(TARGET_CPU)" == "IA64" +TARGETCPUPOSTFIX = -ia64 +!endif +!if "$(WX_SHARED)" == "0" +SHAREDBUILDPOSTFIX = static +!endif +!if "$(WX_SHARED)" == "1" +SHAREDBUILDPOSTFIX = shared +!endif +!if "$(WX_UNICODE)" == "1" +UNICODEBUILDPOSTFIX = u +!endif +!if "$(WX_DEBUG)" == "1" +DEBUGBUILDPOSTFIX = d +!endif +!if "$(TARGET_CPU)" == "AMD64" ____mmex_tests_CPU_SUF_FILENAMES = _amd64 !endif !if "$(TARGET_CPU)" == "IA64" @@ -182,24 +200,6 @@ !if "$(WX_MONOLITHIC)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX).lib !endif -!if "$(TARGET_CPU)" == "AMD64" -TARGETCPUPOSTFIX = -x64 -!endif -!if "$(TARGET_CPU)" == "IA64" -TARGETCPUPOSTFIX = -ia64 -!endif -!if "$(WX_SHARED)" == "0" -SHAREDBUILDPOSTFIX = static -!endif -!if "$(WX_SHARED)" == "1" -SHAREDBUILDPOSTFIX = shared -!endif -!if "$(WX_UNICODE)" == "1" -UNICODEBUILDPOSTFIX = u -!endif -!if "$(WX_DEBUG)" == "1" -DEBUGBUILDPOSTFIX = d -!endif !if "$(WX_DEBUG)" == "0" __OPTIMIZEFLAG = -O2 !endif @@ -280,7 +280,7 @@ | check: all - cd ..\..\..\runtime && D:\mmex\trunk\mmex\build\msw\tests\bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\mmex_tests.exe + cd ..\..\..\runtime && ..\build\msw\tests\bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\mmex_tests.exe bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\sqlite3_sqlite3secure.obj: ..\..\..\sqlite\sqlite3secure.c $(CC) -q -c -P- -o$@ $(SQLITE3_CFLAGS) ..\..\..\sqlite\sqlite3secure.c Modified: trunk/mmex/build/msw/tests/makefile.gcc =================================================================== --- trunk/mmex/build/msw/tests/makefile.gcc 2009-10-31 09:47:59 UTC (rev 710) +++ trunk/mmex/build/msw/tests/makefile.gcc 2009-10-31 10:20:44 UTC (rev 711) @@ -115,6 +115,24 @@ WX3RDPARTYLIBPOSTFIX = h endif ifeq ($(TARGET_CPU),AMD64) +TARGETCPUPOSTFIX = -x64 +endif +ifeq ($(TARGET_CPU),IA64) +TARGETCPUPOSTFIX = -ia64 +endif +ifeq ($(WX_SHARED),0) +SHAREDBUILDPOSTFIX = static +endif +ifeq ($(WX_SHARED),1) +SHAREDBUILDPOSTFIX = shared +endif +ifeq ($(WX_UNICODE),1) +UNICODEBUILDPOSTFIX = u +endif +ifeq ($(WX_DEBUG),1) +DEBUGBUILDPOSTFIX = d +endif +ifeq ($(TARGET_CPU),AMD64) ____mmex_tests_CPU_SUF_FILENAMES = _amd64 endif ifeq ($(TARGET_CPU),IA64) @@ -212,24 +230,6 @@ WXLIBPOSTFIX = uh endif endif -ifeq ($(TARGET_CPU),AMD64) -TARGETCPUPOSTFIX = -x64 -endif -ifeq ($(TARGET_CPU),IA64) -TARGETCPUPOSTFIX = -ia64 -endif -ifeq ($(WX_SHARED),0) -SHAREDBUILDPOSTFIX = static -endif -ifeq ($(WX_SHARED),1) -SHAREDBUILDPOSTFIX = shared -endif -ifeq ($(WX_UNICODE),1) -UNICODEBUILDPOSTFIX = u -endif -ifeq ($(WX_DEBUG),1) -DEBUGBUILDPOSTFIX = d -endif ifeq ($(WX_DEBUG),0) __OPTIMIZEFLAG = -O2 endif @@ -285,7 +285,7 @@ $(CXX) -o $@ $(MMEX_TESTS_OBJECTS) -L$(WX_DIR)\lib\gcc$(____mmex_tests_CPU_SUF_FILENAMES)$(____mmex_tests_LIB_SUF_FILENAMES) -mthreads -L$(WX_DIR)$(WXLIBPATH) -mthreads $(__DEBUGINFO) $(LDFLAGS) $(__WXLIB_CORE_NAME_p) $(__WXLIB_QA_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\libsqlite3.a gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\libUnitTestPP.a check: all - cd ..\..\..\runtime && D:\mmex\trunk\mmex\build\msw\tests\gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\mmex_tests.exe + cd ..\..\..\runtime && ..\build\msw\tests\gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\mmex_tests.exe gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\sqlite3_sqlite3secure.o: ../../../sqlite/sqlite3secure.c $(CC) -c -o $@ $(SQLITE3_CFLAGS) $(CPPDEPS) $< Modified: trunk/mmex/build/msw/tests/makefile.vc =================================================================== --- trunk/mmex/build/msw/tests/makefile.vc 2009-10-31 09:47:59 UTC (rev 710) +++ trunk/mmex/build/msw/tests/makefile.vc 2009-10-31 10:20:44 UTC (rev 711) @@ -118,6 +118,24 @@ WX3RDPARTYLIBPOSTFIX = h !endif !if "$(TARGET_CPU)" == "AMD64" +TARGETCPUPOSTFIX = -x64 +!endif +!if "$(TARGET_CPU)" == "IA64" +TARGETCPUPOSTFIX = -ia64 +!endif +!if "$(WX_SHARED)" == "0" +SHAREDBUILDPOSTFIX = static +!endif +!if "$(WX_SHARED)" == "1" +SHAREDBUILDPOSTFIX = shared +!endif +!if "$(WX_UNICODE)" == "1" +UNICODEBUILDPOSTFIX = u +!endif +!if "$(WX_DEBUG)" == "1" +DEBUGBUILDPOSTFIX = d +!endif +!if "$(TARGET_CPU)" == "AMD64" ____mmex_tests_CPU_SUF_FILENAMES = _amd64 !endif !if "$(TARGET_CPU)" == "IA64" @@ -210,24 +228,6 @@ !if "$(WX_MONOLITHIC)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX).lib !endif -!if "$(TARGET_CPU)" == "AMD64" -TARGETCPUPOSTFIX = -x64 -!endif -!if "$(TARGET_CPU)" == "IA64" -TARGETCPUPOSTFIX = -ia64 -!endif -!if "$(WX_SHARED)" == "0" -SHAREDBUILDPOSTFIX = static -!endif -!if "$(WX_SHARED)" == "1" -SHAREDBUILDPOSTFIX = shared -!endif -!if "$(WX_UNICODE)" == "1" -UNICODEBUILDPOSTFIX = u -!endif -!if "$(WX_DEBUG)" == "1" -DEBUGBUILDPOSTFIX = d -!endif !if "$(WX_DEBUG)" == "0" __DEBUGINFO = !endif @@ -318,7 +318,7 @@ mt.exe -manifest "vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\mmex_tests.exe.manifest" -outputresource:"vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\mmex_tests.exe";1 check: all - cd ..\..\..\runtime && D:\mmex\trunk\mmex\build\msw\tests\vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\mmex_tests.exe + cd ..\..\..\runtime && ..\build\msw\tests\vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\mmex_tests.exe vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)$(TARGETCPUPOSTFIX)\sqlite3_sqlite3secure.obj: ..\..\..\sqlite\sqlite3secure.c $(CC) /c /nologo /TC /Fo$@ $(SQLITE3_CFLAGS) ..\..\..\sqlite\sqlite3secure.c Modified: trunk/mmex/src/tests/Makefile.in =================================================================== --- trunk/mmex/src/tests/Makefile.in 2009-10-31 09:47:59 UTC (rev 710) +++ trunk/mmex/src/tests/Makefile.in 2009-10-31 10:20:44 UTC (rev 711) @@ -171,7 +171,7 @@ check: all cp $(srcdir)/../../runtime/currency.db3 . - cd . && ./mmex_tests + ./mmex_tests sqlite3_sqlite3secure.o: $(srcdir)/../../sqlite/sqlite3secure.c $(CCC) -c -o $@ $(SQLITE3_CFLAGS) $(srcdir)/../../sqlite/sqlite3secure.c Modified: trunk/mmex/src/tests/mmex_tests.bkl =================================================================== --- trunk/mmex/src/tests/mmex_tests.bkl 2009-10-31 09:47:59 UTC (rev 710) +++ trunk/mmex/src/tests/mmex_tests.bkl 2009-10-31 10:20:44 UTC (rev 711) @@ -80,12 +80,12 @@ <command cond="FORMAT!='autoconf'"> <!-- can't get executable dir if autoconf --> - cd $(nativePaths(SRCDIR + '/runtime')) && $(nativePaths(os.path.abspath(os.path.dirname(OUTPUT_FILE)) + '/' + BUILDDIR + '/mmex_tests' + EXEEXT)) + cd $(nativePaths(SRCDIR + '/runtime')) && $('..\\build\\msw\\tests\\' + BUILDDIR + '\\mmex_tests' + EXEEXT) </command> <command cond="FORMAT=='autoconf'"> $(COPY) $(nativePaths(SRCDIR + '/runtime/currency.db3')) $(nativePaths(BUILDDIR)) - cd $(nativePaths(BUILDDIR)) && $(nativePaths('./mmex_tests')) + $(nativePaths('./mmex_tests')) </command> <clean-files cond="FORMAT=='autoconf'">$(nativePaths(BUILDDIR + '/currency.db3'))</clean-files> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |