- Move mkutil to packaging/windows-mkzip. Any further scripts to build dedicated download packages from a SVN working copy should go into packaging/<x> 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,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 ()

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
 /////////////////////////////////////////////////////////////////////////////

mkutil/clean.bat

@@ -1,6 +0,0 @@
-cd ..\code
-mingw32-make -f makefile.mingw clean
-
-cd ..
-del /Q /S obj bin lib
-

mkutil/make_mingw.bat

@@ -1,4 +0,0 @@
-cd ..\code
-mingw32-make -f makefile.mingw
-
-pause

mkutil/revision.h

@@ -1 +0,0 @@
-#define SVNRevision  526 

mkutil/mkfinal.bat → 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

mkutil/mkrev.bat → 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
 

revision.h

@@ -0,0 +1 @@
+#define SVNRevision  578 

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
 /////////////////////////////////////////////////////////////////////////////