From a7f298e6c31f669d7820164c819798d1ba11d9c0 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Thu, 4 Mar 2010 18:46:54 +0000 Subject: [PATCH] - Move mkutil to packaging/windows-mkzip. Any further scripts to build dedicated download packages from a SVN working copy should go into packaging/ from now. - Migrate mkutil/revision.h to the root folder, adjust all dependent paths. - Get rid of unneeded win batch scripts. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@584 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/AssimpPCH.cpp | 8 ++--- code/res/assimp.rc | 2 +- mkutil/clean.bat | 6 ---- mkutil/make_mingw.bat | 4 --- mkutil/revision.h | 1 - .../windows-mkzip}/bin_readme.txt | 0 .../windows-mkzip}/mkfinal.bat | 30 +++++++++---------- {mkutil => packaging/windows-mkzip}/mkrev.bat | 8 ++--- revision.h | 1 + tools/assimp_cmd/assimp_cmd.rc | 2 +- 10 files changed, 25 insertions(+), 37 deletions(-) delete mode 100644 mkutil/clean.bat delete mode 100644 mkutil/make_mingw.bat delete mode 100644 mkutil/revision.h rename {mkutil => packaging/windows-mkzip}/bin_readme.txt (100%) rename {mkutil => packaging/windows-mkzip}/mkfinal.bat (76%) rename {mkutil => packaging/windows-mkzip}/mkrev.bat (76%) create mode 100644 revision.h diff --git a/code/AssimpPCH.cpp b/code/AssimpPCH.cpp index 57eb35e3d..b1b2bf7b6 100644 --- a/code/AssimpPCH.cpp +++ b/code/AssimpPCH.cpp @@ -8,10 +8,10 @@ // Legal information string - dont't remove from image! static const char* LEGAL_INFORMATION = -"Open Asset Import Library (ASSIMP).\n" +"Open Asset Import Library (Assimp).\n" "A free C/C++ library to import various 3D file formats into applications\n\n" -"(c) ASSIMP Development Team, 2008-2009\n" +"(c) ASSIMP Development Team, 2008-2010\n" "License: 3-clause BSD license\n" "Website: http://assimp.sourceforge.net\n" ; @@ -59,8 +59,8 @@ ASSIMP_API unsigned int aiGetCompileFlags () { return flags; } -// include current build revision -#include "../mkutil/revision.h" +// include current build revision, which is even updated from time to time -- :-) +#include "../revision.h" // ------------------------------------------------------------------------------------------------ ASSIMP_API unsigned int aiGetVersionRevision () diff --git a/code/res/assimp.rc b/code/res/assimp.rc index a12f3f6ed..a07113836 100644 --- a/code/res/assimp.rc +++ b/code/res/assimp.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "..\..\mkutil\revision.h" +#include "..\..\revision.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/mkutil/clean.bat b/mkutil/clean.bat deleted file mode 100644 index 052a71e8d..000000000 --- a/mkutil/clean.bat +++ /dev/null @@ -1,6 +0,0 @@ -cd ..\code -mingw32-make -f makefile.mingw clean - -cd .. -del /Q /S obj bin lib - diff --git a/mkutil/make_mingw.bat b/mkutil/make_mingw.bat deleted file mode 100644 index a693a957f..000000000 --- a/mkutil/make_mingw.bat +++ /dev/null @@ -1,4 +0,0 @@ -cd ..\code -mingw32-make -f makefile.mingw - -pause \ No newline at end of file diff --git a/mkutil/revision.h b/mkutil/revision.h deleted file mode 100644 index 55cc682c7..000000000 --- a/mkutil/revision.h +++ /dev/null @@ -1 +0,0 @@ -#define SVNRevision 526 diff --git a/mkutil/bin_readme.txt b/packaging/windows-mkzip/bin_readme.txt similarity index 100% rename from mkutil/bin_readme.txt rename to packaging/windows-mkzip/bin_readme.txt diff --git a/mkutil/mkfinal.bat b/packaging/windows-mkzip/mkfinal.bat similarity index 76% rename from mkutil/mkfinal.bat rename to packaging/windows-mkzip/mkfinal.bat index 14e648bfc..a906c2919 100644 --- a/mkutil/mkfinal.bat +++ b/packaging/windows-mkzip/mkfinal.bat @@ -41,11 +41,11 @@ rem ----------------------------------------------------- rem Build output file names rem ----------------------------------------------------- -cd ..\bin +cd ..\..\bin svnversion > tmpfile.txt SET /p REVISIONBASE= < tmpfile.txt DEL /q tmpfile.txt -cd ..\mkutil +cd ..\packaging\windows-mkzip SET VERSIONBASE=1.0.%REVISIONBASE% @@ -72,21 +72,21 @@ rem ----------------------------------------------------- SET BINCFG_x86=release-dll_win32 SET BINCFG_x64=release-dll_x64 -copy /Y ..\bin\assimpview_%BINCFG_x86%\assimp_view.exe "final\%OUT_BIN%\x86\assimp_view.exe" -copy /Y ..\bin\assimpview_%BINCFG_x64%\assimp_view.exe "final\%OUT_BIN%\x64\assimp_view.exe" +copy /Y ..\..\bin\assimpview_%BINCFG_x86%\assimp_view.exe "final\%OUT_BIN%\x86\assimp_view.exe" +copy /Y ..\..\bin\assimpview_%BINCFG_x64%\assimp_view.exe "final\%OUT_BIN%\x64\assimp_view.exe" -copy /Y ..\bin\assimpcmd_%BINCFG_x86%\assimp.exe "final\%OUT_BIN%\x86\assimp.exe" -copy /Y ..\bin\assimpcmd_%BINCFG_x64%\assimp.exe "final\%OUT_BIN%\x64\assimp.exe" +copy /Y ..\..\bin\assimpcmd_%BINCFG_x86%\assimp.exe "final\%OUT_BIN%\x86\assimp.exe" +copy /Y ..\..\bin\assimpcmd_%BINCFG_x64%\assimp.exe "final\%OUT_BIN%\x64\assimp.exe" -copy /Y ..\bin\assimp_%BINCFG_x86%\Assimp32.dll "final\%OUT_BIN%\x86\Assimp32.dll" -copy /Y ..\bin\assimp_%BINCFG_x64%\Assimp64.dll "final\%OUT_BIN%\x64\Assimp64.dll" +copy /Y ..\..\bin\assimp_%BINCFG_x86%\Assimp32.dll "final\%OUT_BIN%\x86\Assimp32.dll" +copy /Y ..\..\bin\assimp_%BINCFG_x64%\Assimp64.dll "final\%OUT_BIN%\x64\Assimp64.dll" -copy ..\LICENSE final\%OUT_BIN%\LICENSE -copy ..\CREDITS final\%OUT_BIN%\CREDITS +copy ..\..\LICENSE final\%OUT_BIN%\LICENSE +copy ..\..\CREDITS final\%OUT_BIN%\CREDITS copy bin_readme.txt final\%OUT_BIN%\README copy bin_readme.txt final\%OUT_BIN%\README -copy ..\doc\AssimpCmdDoc_Html\AssimpCmdDoc.chm final\%OUT_BIN%\CommandLine.chm +copy ..\..\doc\AssimpCmdDoc_Html\AssimpCmdDoc.chm final\%OUT_BIN%\CommandLine.chm rem ----------------------------------------------------- rem Do a clean export of the repository and build SDK @@ -95,11 +95,9 @@ rem We take the current revision and remove some stuff rem that is nto yet ready to be published. rem ----------------------------------------------------- -svn export .\..\ final\%OUT_SDK% -rem RD /s /q final\%OUT_SDK%\mkutil -RD /s /q final\%OUT_SDK%\port\jAssimp -RD /s /q final\%OUT_SDK%\port\Assimp.net -RD /s /q final\%OUT_SDK%\workspaces\jidea5.1 +svn export .\..\..\ final\%OUT_SDK% +rem RD /s /q final\%OUT_SDK%\packaging + rem Copy doc to a suitable place move final\%OUT_SDK%\doc\AssimpDoc_Html\AssimpDoc.chm final\%OUT_SDK%\Documentation.chm diff --git a/mkutil/mkrev.bat b/packaging/windows-mkzip/mkrev.bat similarity index 76% rename from mkutil/mkrev.bat rename to packaging/windows-mkzip/mkrev.bat index 5c964768d..72b453ef3 100644 --- a/mkutil/mkrev.bat +++ b/packaging/windows-mkzip/mkrev.bat @@ -9,17 +9,17 @@ rem ----------------------------------------------------- rem This is not very elegant, but it works. rem ./bin shouldn't have any local modifications -cd ..\bin +cd .\..\..\bin svnversion > tmpfile.txt set /p addtext= < tmpfile.txt del /q tmpfile.txt -cd ..\mkutil +cd ..\packaging\windows-mkzip echo #define SVNRevision > tmpfile.txt -if exist revision.h del /q revision.h +if exist ..\..\revision.h del /q ..\..\revision.h for /f "delims=" %%l in (tmpfile.txt) Do ( - echo %%l %addtext% >> revision.h + echo %%l %addtext% >> ..\..\revision.h ) del /q tmpfile.txt diff --git a/revision.h b/revision.h new file mode 100644 index 000000000..4169fb83e --- /dev/null +++ b/revision.h @@ -0,0 +1 @@ +#define SVNRevision 578 diff --git a/tools/assimp_cmd/assimp_cmd.rc b/tools/assimp_cmd/assimp_cmd.rc index 96f18afff..0ff75dc7e 100644 --- a/tools/assimp_cmd/assimp_cmd.rc +++ b/tools/assimp_cmd/assimp_cmd.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "../../mkutil/revision.h" +#include "../../revision.h" #define APSTUDIO_READONLY_SYMBOLS /////////////////////////////////////////////////////////////////////////////