Permalink
Browse files

[12205] Rename vmaps extractor folder and project name

  • Loading branch information...
1 parent 96e7635 commit 6b35bc3b4fc270c355dcb37ef5aeeafb45610f4f Cyberium committed with Schmoozerd Oct 7, 2012
Showing with 14 additions and 14 deletions.
  1. +3 −3 contrib/extractor_binary/ExtractResources.sh
  2. +1 −1 contrib/extractor_binary/README.txt
  3. BIN contrib/extractor_binary/{vmapExtractor3.exe → vmapExtractor.exe}
  4. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/.gitignore
  5. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/CMakeLists.txt
  6. +3 −3 contrib/{vmap_extractor_v3 → vmap_extractor}/README
  7. +1 −1 contrib/{vmap_extractor_v3 → vmap_extractor}/make_vmaps.bat
  8. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/CMakeLists.txt
  9. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/adtfile.cpp
  10. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/adtfile.h
  11. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/dbcfile.cpp
  12. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/dbcfile.h
  13. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/loadlib/loadlib.h
  14. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/model.cpp
  15. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/model.h
  16. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/modelheaders.h
  17. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/mpq_libmpq.cpp
  18. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/mpq_libmpq04.h
  19. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/vec3d.h
  20. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/vmapexport.cpp
  21. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/vmapexport.h
  22. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/wdtfile.cpp
  23. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/wdtfile.h
  24. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/wmo.cpp
  25. 0 contrib/{vmap_extractor_v3 → vmap_extractor}/vmapextract/wmo.h
  26. +1 −1 ...p_extractor_v3/win/VC100/vmapExtractor3.vcxproj → vmap_extractor/win/VC100/vmapExtractor.vcxproj}
  27. +2 −2 ...{vmap_extractor_v3/win/VC90/vmapExtractor3.vcproj → vmap_extractor/win/VC90/vmapExtractor.vcproj}
  28. +1 −1 ...rib/{vmap_extractor_v3/win/vmapExtractor3_VC100.sln → vmap_extractor/win/vmapExtractor_VC100.sln}
  29. +1 −1 contrib/{vmap_extractor_v3/win/vmapExtractor3_VC90.sln → vmap_extractor/win/vmapExtractor_VC90.sln}
  30. +1 −1 src/shared/revision_nr.h
@@ -144,11 +144,11 @@ fi
if [ "$USE_VMAPS" = "1" ]
then
echo "`date`: Start extraction of vmaps..." | tee -a $LOG_FILE
- vmapExtractor3 | tee -a $DETAIL_LOG_FILE
+ vmapExtractor | tee -a $DETAIL_LOG_FILE
echo "`date`: Extracting of vmaps finished" | tee -a $LOG_FILE
mkdir vmaps
echo "`date`: Start assembling of vmaps..." | tee -a $LOG_FILE
- vmap_assembler.exe buildings vmaps | tee -a $DETAIL_LOG_FILE
+ vmap_assembler buildings vmaps | tee -a $DETAIL_LOG_FILE
echo "`date`: Assembling of vmaps finished" | tee -a $LOG_FILE
echo | tee -a $LOG_FILE
@@ -158,5 +158,5 @@ fi
## Extract mmaps
if [ "$USE_MMAPS" = "1" ]
then
- MoveMapGen.sh $NUM_CPU $LOG_FILE $DETAIL_LOG_FILE
+ sh MoveMapGen.sh $NUM_CPU $LOG_FILE $DETAIL_LOG_FILE
fi
@@ -31,6 +31,6 @@ MaNGOSExtractor_detailed.log which includes all the information about the extrac
If you want to toggle some parts in the extraction process, there are a few internal variables in the extraction scripts, that can be modified.
-Consider the Readme's in the directories extractor, vmap_assembler, vmap_extractor_v3 and mmap for further information about detail.
+Consider the Readme's in the directories extractor, vmap_assembler, vmap_extractor and mmap for further information about detail.
Also especially related to mmaps updating you might be interested in using the MoveMapGen.sh script.
@@ -9,7 +9,7 @@ Linux:
$ ./configure
$ make
- After that, cd to contrib/vmap_extractor_v2/ and execute:
+ After that, cd to contrib/vmap_extractor/ and execute:
$ cmake .
$ make
@@ -30,8 +30,8 @@ Windows:
1. Building
- Just build the solution in contrib\vmap_extractor_v2\win
- Resulting binaries will be in contrib\vmap_extractor_v2\bin\$(PlatformName)_$(ConfigurationName)
+ Just build the solution in contrib\vmap_extractor\win
+ Resulting binaries will be in contrib\vmap_extractor\bin\$(PlatformName)_$(ConfigurationName)
2. Extracting
@@ -14,7 +14,7 @@ IF EXIST buildings\dir (ECHO The buildings folder already exist do you want to d
echo If YES hit Enter to continue if no CLOSE the program now! . . .
pause>nul
DEL /S /Q buildings)
-vmapExtractor3.exe
+vmapExtractor.exe
cls
echo.
echo.
@@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}</ProjectGuid>
- <RootNamespace>vmapExtractor3</RootNamespace>
+ <RootNamespace>vmapExtractor</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="vmapExtractor3"
+ Name="vmapExtractor"
ProjectGUID="{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
- RootNamespace="vmapExtractor3"
+ RootNamespace="vmapExtractor"
TargetFrameworkVersion="196613"
>
<Platforms>
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor3", "VC100\vmapExtractor3.vcxproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor", "VC100\vmapExtractor.vcxproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
ProjectSection(ProjectDependencies) = postProject
{B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C}
{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor3", "VC90\vmapExtractor3.vcproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor", "VC90\vmapExtractor.vcproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
ProjectSection(ProjectDependencies) = postProject
{B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C}
{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
View
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
- #define REVISION_NR "12204"
+ #define REVISION_NR "12205"
#endif // __REVISION_NR_H__

0 comments on commit 6b35bc3

Please sign in to comment.