Merging revisions 1-HEAD of http://192.168.11.7/svn/saccubus/branches/20091208_vhook_...

[coroid/inqubus.git] / vhook / nbproject / Package-Release.bash

diff --git a/vhook/nbproject/Package-Release.bash b/vhook/nbproject/Package-Release.bash
index f37e301..a0b08d3 100644 (file)
--- a/vhook/nbproject/Package-Release.bash
+++ b/vhook/nbproject/Package-Release.bash
@@ -6,12 +6,14 @@
 
 # Macros
 TOP=`pwd`
-PLATFORM=MinGW-Windows
-TMPDIR=build/Release/${PLATFORM}/tmp-packaging
+CND_PLATFORM=MinGW_sjlj-Windows
+CND_CONF=Release
+CND_DISTDIR=dist
+TMPDIR=build/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=dist/Release/${PLATFORM}/nicovideo.dll
+OUTPUT_PATH=dist/Release/${CND_PLATFORM}/nicovideo.dll
 OUTPUT_BASENAME=nicovideo.dll
-PACKAGE_TOP_DIR=libvhook.dll/
+PACKAGE_TOP_DIR=libsaccubusvhook.dll/
 
 # Functions
 function checkReturnCode
@@ -50,21 +52,21 @@ function copyFileToTmpDir
 
 # Setup
 cd "${TOP}"
-mkdir -p dist/Release/${PLATFORM}/package
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
 rm -rf ${TMPDIR}
 mkdir -p ${TMPDIR}
 
 # Copy files and create directories and links
 cd "${TOP}"
-makeDirectory ${TMPDIR}/libvhook.dll/lib
+makeDirectory ${TMPDIR}/libsaccubusvhook.dll/lib
 copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
 
 
 # Generate tar file
 cd "${TOP}"
-rm -f dist/Release/${PLATFORM}/package/libvhook.dll.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libsaccubusvhook.dll.tar
 cd ${TMPDIR}
-tar -vcf ../../../../dist/Release/${PLATFORM}/package/libvhook.dll.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libsaccubusvhook.dll.tar *
 checkReturnCode
 
 # Cleanup