generated files and extracted application files now go to 'build' directory

git-svn-id: svn+ssh://svn.psi-im.org/home/psi/svn/win-installer/trunk@15 2d3a5ac0-73f9-4639-b284-2310bd1da355

psi.nsi

@@ -203,7 +203,7 @@ Section "!$LSTR_PSIBASE" SectionBase
   SectionIn RO
   ; Set Section Files and Shortcuts
 !ifndef LANG_TEST_BUILD
- !include "psi_files_install.nsi"
+ !include "${APP_BUILD}psi_files_install.nsi"
 !else
   SetOutPath "$INSTDIR\"
   File "${INSTALLER_HOME}\psi_app\COPYING" ;install only one file when LANG_TEST_BUILD
@@ -219,7 +219,7 @@ SectionEnd
 
 !ifdef BUILD_WITH_LANGPACKS
 SubSection "$LSTR_LANGUAGES" SectionLang
-  !include "psi_lang_install.inc"
+  !include "${APP_BUILD}psi_lang_install.inc"
   ; See ReadME.txt for more information
 SubSectionEnd
 !endif
@@ -338,7 +338,7 @@ Function .onInit
 
 !ifdef BUILD_WITH_LANGPACKS
 ; automatically choose language pack to install
-  !include "psi_lang_setup.inc"
+  !include "${APP_BUILD}psi_lang_setup.inc"
   ; See ReadME.txt for more information
 ; ****************
 !endif
@@ -480,12 +480,12 @@ Section Uninstall
 
 !ifdef BUILD_WITH_LANGPACKS
   ; Delete Language files
-  !include "psi_lang_uninstall.inc"
+  !include "${APP_BUILD}psi_lang_uninstall.inc"
   ; See ReadME.txt for more information
 !endif
 
   ; Clean up Psi (base)
-  !include "psi_files_uninstall.nsi"
+  !include "${APP_BUILD}psi_files_uninstall.nsi"
 SectionEnd
 
 

tools/prepfiles

@@ -17,6 +17,8 @@ indir=$(find -type d | grep / | head -n 1 | sed "s|./||g")
 
 find $indir -type d > directories.list
 
+[ ! -d ../build ] && mkdir ../build
+
 out_inst="psi_files_install.nsi"
 echo ";" > $out_inst
 echo "; List of files to be INSTALLED (Base section)" >> $out_inst
@@ -35,7 +37,7 @@ cat directories.list | while read cline; do
 	echo -e "\tSetOutPath \"$outpath\"" >> $out_inst
 	find $cline -type f | grep -v "$cline/.*/.*" | while read cfile; do
 		fpath=$(echo "$cfile" | sed -e "s|$indir||g")
-		echo -e "\tFile \"psi_app$fpath\"" >> $out_inst
+		echo -e "\tFile \"\${APP_SOURCE}$fpath\"" >> $out_inst
 		echo -e "\tDelete \"\$INSTDIR$fpath\"" >> $out_uninst
 		done
 	echo >> $out_inst
@@ -47,16 +49,14 @@ cat directories.list | sort -r | while read cdir; do
 	echo -e "\tRMDir \"$outpath\"" >> $out_uninst
 done
 
-sed -i "s|/|\\\|g" $out_inst 
-sed -i "s|/|\\\|g" $out_uninst 
+sed 's|/|/|g' $out_inst  > ../build/$out_inst
+sed 's|/|\\|g' $out_uninst > ../build/$out_uninst
 
 rm -f directories.list
 
-rm -rf ../psi_app
-#mkdir ../psi_app
-ls $indir/
-cp -a $indir ../psi_app
+rm -rf ../build/psi_app
+cp -r $indir ../build/psi_app
 rm -rf $indir
 
-mv $out_inst ../
-mv $out_uninst ../
+rm $out_inst
+rm $out_uninst
\ No newline at end of file

tools/preplang

@@ -13,11 +13,17 @@ import os
 import string
 import array
 
+# create build paths if they do not exist
+if not os.path.exists("../build"):
+	os.mkdir("../build");
+if not os.path.exists("../build/psi_lang"):
+	os.mkdir("../build/psi_lang");
+
 fmap=open("psi_lang.map")
 
-flanginst=open("../psi_lang_install.inc","w")
-flangsetup=open("../psi_lang_setup.inc","w")
-flanguninst=open("../psi_lang_uninstall.inc","w")
+flanginst=open("../build/psi_lang_install.inc","w")
+flangsetup=open("../build/psi_lang_setup.inc","w")
+flanguninst=open("../build/psi_lang_uninstall.inc","w")
 
 langmap={}
 for s in fmap.readlines():
@@ -28,7 +34,7 @@ for s in fmap.readlines():
 		langmap[langsettings[0]]=langsettings[1:]
 
 langlist={}
-for file in os.listdir("../psi_lang"):
+for file in os.listdir("../build/psi_lang"):
 	if (not langmap.has_key(file)):
 		print "!Language definition not found for file: "+file+" (skipped)"
 		continue