[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30755] trunk/blender: move directories:
Campbell Barton
ideasman42 at gmail.com
Mon Jul 26 13:47:34 CEST 2010
Revision: 30755
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30755
Author: campbellbarton
Date: 2010-07-26 13:47:33 +0200 (Mon, 26 Jul 2010)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/blender/Makefile
trunk/blender/build_files/scons/tools/Blender.py
trunk/blender/po/Makefile
trunk/blender/release/Makefile
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/darwin/Makefile
Added Paths:
-----------
trunk/blender/build_files/make/dlltool/
trunk/blender/release/bin/
Removed Paths:
-------------
trunk/blender/bin/
trunk/blender/dlltool/
Modified: trunk/blender/Makefile
===================================================================
--- trunk/blender/Makefile 2010-07-26 11:17:43 UTC (rev 30754)
+++ trunk/blender/Makefile 2010-07-26 11:47:33 UTC (rev 30755)
@@ -45,7 +45,7 @@
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
Copied: trunk/blender/build_files/make/dlltool (from rev 30745, trunk/blender/dlltool)
Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py 2010-07-26 11:17:43 UTC (rev 30754)
+++ trunk/blender/build_files/scons/tools/Blender.py 2010-07-26 11:47:33 UTC (rev 30755)
@@ -529,13 +529,13 @@
# 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)
Modified: trunk/blender/po/Makefile
===================================================================
--- trunk/blender/po/Makefile 2010-07-26 11:17:43 UTC (rev 30754)
+++ trunk/blender/po/Makefile 2010-07-26 11:47:33 UTC (rev 30755)
@@ -51,7 +51,7 @@
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
Modified: trunk/blender/release/Makefile
===================================================================
--- trunk/blender/release/Makefile 2010-07-26 11:17:43 UTC (rev 30754)
+++ trunk/blender/release/Makefile 2010-07-26 11:47:33 UTC (rev 30755)
@@ -114,8 +114,8 @@
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)
Copied: trunk/blender/release/bin (from rev 30745, trunk/blender/bin)
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2010-07-26 11:17:43 UTC (rev 30754)
+++ trunk/blender/source/creator/CMakeLists.txt 2010-07-26 11:47:33 UTC (rev 30755)
@@ -125,14 +125,14 @@
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 @@
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_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 @@
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 @@
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}\"
Modified: trunk/blender/source/darwin/Makefile
===================================================================
--- trunk/blender/source/darwin/Makefile 2010-07-26 11:17:43 UTC (rev 30754)
+++ trunk/blender/source/darwin/Makefile 2010-07-26 11:47:33 UTC (rev 30755)
@@ -45,7 +45,7 @@
@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"
More information about the Bf-blender-cvs
mailing list