move directories:
authorCampbell Barton <ideasman42@gmail.com>
Mon, 26 Jul 2010 11:47:33 +0000 (11:47 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 26 Jul 2010 11:47:33 +0000 (11:47 +0000)
 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

Makefile
build_files/scons/tools/Blender.py
po/Makefile
release/Makefile
release/bin/.blender/.Blanguages [moved from bin/.blender/.Blanguages with 100% similarity]
release/bin/.blender/.bfont.ttf [moved from bin/.blender/.bfont.ttf with 100% similarity]
release/bin/blender-thumbnailer.py [moved from bin/blender-thumbnailer.py with 100% similarity]
source/creator/CMakeLists.txt
source/darwin/Makefile

index b16e046d5e858dc41c3335529ea9724c5573bf9c..d92edf2c02c3c3439ee2e0f06eb69593e1035825 100644 (file)
--- 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
index 7f5ce4767e38c86ee28cca0838f5e4c0412ff594..1c2fccec322ff1d9d301e26ecc48d416c04089b1 100644 (file)
@@ -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)
index b656a00fb381d33fcdddbf895b37de39b35c897e..bbd1caa68ad422c60d7083c7e91d195f36c3079f 100644 (file)
@@ -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
index 809ac54872412d4961d9263d22b1ca35c5426504..e6d904ea13cb625394e90a8be03b7b1b913a27fe 100644 (file)
@@ -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)
index 12bb371de631c21b1c91982c63daead9e87c9b3e..b678dd8881102e7643f379474ceb32a0fb9683f6 100644 (file)
@@ -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}\"
index 6007ff4d91c1b80b873165053951984198b42da6..9095f1d8e92532cb0c59ebd48fea78c56a0a27cd 100644 (file)
@@ -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"