move directories:

 dlltool --> build_files/make/dlltool
 bin --> release/bin
 
Since dlltool is only used make + mingw and ./bin is misleading because it would seem the blender binary would be copied there, but its just used for home directory files.

updated scons/cmake/make

9 files changed, 21 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index b16e046d5e8..d92edf2c02c 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ MAKEFLAGS=-I$(NANBLENDERHOME)/build_files/make --no-print-directory
 
 SOURCEDIR = 
 ifeq ($(FREE_WINDOWS),true)
-    DIRS ?= dlltool extern intern source po
+    DIRS ?= $(NANBLENDERHOME)/build_files/make/dlltool extern intern source po
 else
     DIRS ?= extern intern source po
 endif
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 7f5ce4767e3..1c2fccec322 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -529,13 +529,13 @@ def AppIt(target=None, source=None, env=None):
 #	print cmd
 	commands.getoutput(cmd)
 	cmd = installdir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
-	shutil.copy(bldroot + '/bin/.blender/.bfont.ttf', cmd)
-	shutil.copy(bldroot + '/bin/.blender/.Blanguages', cmd)
-	cmd = 'cp -R %s/bin/%s/locale %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
+	shutil.copy(bldroot + '/release/bin/.blender/.bfont.ttf', cmd)
+	shutil.copy(bldroot + '/release/bin/.blender/.Blanguages', cmd)
+	cmd = 'cp -R %s/release/bin/%s/locale %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
 	commands.getoutput(cmd)
-	cmd = 'cp -R %s/bin/%s/locale %s/%s.app/Contents/MacOS/%s/'%(bldroot,VERSION,installdir,binary,VERSION)
+	cmd = 'cp -R %s/release/bin/%s/locale %s/%s.app/Contents/MacOS/%s/'%(bldroot,VERSION,installdir,binary,VERSION)
 	commands.getoutput(cmd)
-	cmd = 'cp %s/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
+	cmd = 'cp %s/release/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
 	commands.getoutput(cmd)
 	cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
 	commands.getoutput(cmd)
diff --git a/po/Makefile b/po/Makefile
index b656a00fb38..bbd1caa68ad 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -51,7 +51,7 @@ $(DIR)%/LC_MESSAGES/blender.mo: %.po
 	mkdir -p $(@D)
 	msgfmt -o $@ $<
 ifeq ($(BF_VERIFY_MO_FILES), true)
-	@cmp $@ $(NANBLENDERHOME)/bin/.blender/locale/$(basename $<)/LC_MESSAGES/blender.mo \
+	@cmp $@ $(NANBLENDERHOME)/release/bin/.blender/locale/$(basename $<)/LC_MESSAGES/blender.mo \
           || ( echo Mismatch between generated and commited $(basename $<).mo catalog && \
                rm -f $@ && false )
 endif
diff --git a/release/Makefile b/release/Makefile
index 809ac548724..e6d904ea13c 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -114,8 +114,8 @@ install: package
     ifneq ($(OS), darwin)
 	@[ ! -d $(OCGDIR)/bin/.blender ] || \
 		cp -r $(OCGDIR)/bin/.blender $(DISTDIR)
-	@cp $(NANBLENDERHOME)/bin/.blender/.Blanguages $(CONFDIR)
-	@cp $(NANBLENDERHOME)/bin/.blender/.bfont.ttf $(CONFDIR)
+	@cp $(NANBLENDERHOME)/release/bin/.blender/.Blanguages $(CONFDIR)
+	@cp $(NANBLENDERHOME)/release/bin/.blender/.bfont.ttf $(CONFDIR)
     endif
 	@echo "----> Copy blender$(EXT0) executable"
     ifeq ($(TYPE),-static)
diff --git a/bin/.blender/.Blanguages b/release/bin/.blender/.Blanguages
index 9f3b3ef80dc..9f3b3ef80dc 100644
--- a/bin/.blender/.Blanguages
+++ b/release/bin/.blender/.Blanguages
diff --git a/bin/.blender/.bfont.ttf b/release/bin/.blender/.bfont.ttf
index 58cd6b5e61e..58cd6b5e61e 100644
--- a/bin/.blender/.bfont.ttf
+++ b/release/bin/.blender/.bfont.ttf
diff --git a/bin/blender-thumbnailer.py b/release/bin/blender-thumbnailer.py
index 27d6259d172..27d6259d172 100755
--- a/bin/blender-thumbnailer.py
+++ b/release/bin/blender-thumbnailer.py
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 12bb371de63..b678dd88811 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -125,14 +125,14 @@ IF(WITH_INSTALL)
 			TARGET blender POST_BUILD MAIN_DEPENDENCY blender
 			COMMAND rm -Rf ${TARGETDIR}/.blender
 			COMMAND mkdir ${TARGETDIR}/.blender/
-			COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/.blender/
+			COMMAND cp ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf ${TARGETDIR}/.blender/
 		)
     
 		IF(WITH_INTERNATIONAL)
 			ADD_CUSTOM_COMMAND(
 				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-				COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/.blender/
-				COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/.blender/
+				COMMAND cp ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages ${TARGETDIR}/.blender/
+				COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale ${TARGETDIR}/.blender/
 			)
 		ENDIF(WITH_INTERNATIONAL)
     
@@ -200,7 +200,7 @@ IF(WITH_INSTALL)
             DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
         )
 		INSTALL(
-			PROGRAMS ${CMAKE_SOURCE_DIR}/bin/blender-thumbnailer.py
+			PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 		)
 		INSTALL(
@@ -220,7 +220,7 @@ IF(WITH_INSTALL)
         )
 		IF(WITH_INTERNATIONAL)
 			INSTALL(
-    	        DIRECTORY ${CMAKE_SOURCE_DIR}/bin/.blender/locale/
+    	        DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale/
     	        DESTINATION ${BLENDERPATH}/datafiles/locale
     	        PATTERN ".svn" EXCLUDE
 	        )
@@ -243,14 +243,14 @@ IF(WITH_INSTALL)
 			COMMAND cat ${SOURCEINFO} | sed s/VERSION/`cat ${CMAKE_SOURCE_DIR}/release/VERSION`/ | sed s/DATE/`date +'%Y-%b-%d'`/ > ${TARGETINFO}
 			COMMAND rm -Rf ${TARGETDIR}/blender.app/Contents/MacOS/datafiles
 			COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/datafiles/
-			COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/blender.app/Contents/MacOS/datafiles/
+			COMMAND cp ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf ${TARGETDIR}/blender.app/Contents/MacOS/datafiles/
 		)
       
 		IF(WITH_INTERNATIONAL)
 			ADD_CUSTOM_COMMAND(
 				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-				COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/MacOS/datafiles/
-				COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/MacOS/datafiles/
+				COMMAND cp ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/MacOS/datafiles/
+				COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/MacOS/datafiles/
 			)
 		ENDIF(WITH_INTERNATIONAL)
       
@@ -286,9 +286,9 @@ IF(WITH_INSTALL)
 			COMMAND if not exist \"${TARGETDIR}\\.blender\\locale\" mkdir \"${TARGETDIR}\\.blender\\locale\"
 			COMMAND if not exist \"${TARGETDIR}\\.blender\\scripts\" mkdir \"${TARGETDIR}\\.blender\\scripts\"
 			COMMAND if not exist \"${TARGETDIR}\\plugins\" mkdir \"${TARGETDIR}\\plugins\"
-			COMMAND copy /Y \"${CMAKE_SOURCE_DIR}\\bin\\.blender\\.Blanguages\" \"${TARGETDIR}\\.blender\\\" 
-			COMMAND copy /Y \"${CMAKE_SOURCE_DIR}\\bin\\.blender\\.bfont.ttf\" \"${TARGETDIR}\\.blender\\\"
-			COMMAND xcopy /E /Y \"${CMAKE_SOURCE_DIR}\\bin\\.blender\\locale\\*.*\" \"${TARGETDIR}\\.blender\\locale\"
+			COMMAND copy /Y \"${CMAKE_SOURCE_DIR}\\release\\bin\\.blender\\.Blanguages\" \"${TARGETDIR}\\.blender\\\" 
+			COMMAND copy /Y \"${CMAKE_SOURCE_DIR}\\release\\bin\\.blender\\.bfont.ttf\" \"${TARGETDIR}\\.blender\\\"
+			COMMAND xcopy /E /Y \"${CMAKE_SOURCE_DIR}\\release\\bin\\.blender\\locale\\*.*\" \"${TARGETDIR}\\.blender\\locale\"
 			COMMAND xcopy /E /Y \"${CMAKE_SOURCE_DIR}\\release\\scripts\\*.*\" \"${TARGETDIR}\\.blender\\scripts\"
 			COMMAND xcopy /E /Y \"${CMAKE_SOURCE_DIR}\\release\\plugins\\*.*\" \"${TARGETDIR}\\plugins\"
 			COMMAND copy /Y \"${CMAKE_SOURCE_DIR}\\release\\text\\*.*\" \"${TARGETDIR}\"
diff --git a/source/darwin/Makefile b/source/darwin/Makefile
index 6007ff4d91c..9095f1d8e92 100644
--- a/source/darwin/Makefile
+++ b/source/darwin/Makefile
@@ -45,7 +45,7 @@ all::
 	@chmod +x $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/$(APPLICATION)
 ifeq ($(APPLICATION), blender)
 	@echo "---> copying message files"
-	@cp -R $(NANBLENDERHOME)/bin/.blender/locale $(DIR)/bin/$(APPLICATION).app/Contents/Resources
+	@cp -R $(NANBLENDERHOME)/release/bin/.blender/locale $(DIR)/bin/$(APPLICATION).app/Contents/Resources
 	@echo "---> copying .Blanguages"
 	@cp $(NANBLENDERHOME)/bin/.blender/.Blanguages $(DIR)/bin/$(APPLICATION).app/Contents/Resources
 	@echo "---> copying .blender/ scripts"