Merge branch 'blackbox20' into blackbox20KetmarPNG

build-fbsd

@@ -5,7 +5,6 @@ echo
 
 ./run-dev0 <<DATA
 DevCompiler.CompileSubs @Fbsd Fbsd System Std Cons Text Form Dev Comm Fig Obx Raster
-Kernel.Quit(0)
 DATA
 
 echo
@@ -14,9 +13,7 @@ echo
 
 ./run-dev0 <<DATA
 DevLinker1.LinkElfExe FreeBSD blackbox := Kernel$+ Utf FbsdKernel Files FbsdEnv FbsdFiles FbsdGui StdLoader FbsdLoader
-Kernel.Quit(0)
 DATA
-chmod +x blackbox
 
 echo
 echo "linking interpreter"
@@ -24,6 +21,4 @@ echo
 
 ./run-dev0 <<DATA
 DevLinker1.LinkElfExe FreeBSD blackboxInterp := Kernel$+ Utf FbsdKernel Files FbsdEnv FbsdFiles StdLoader FbsdIntLoader
-Kernel.Quit(0)
 DATA
-chmod +x blackboxInterp

build-linux

@@ -5,7 +5,6 @@ echo
 
 ./run-dev0 <<DATA
 DevCompiler.CompileSubs @Lin Lin System Std Cons Text Form Dev Comm Fig Obx Raster
-Kernel.Quit(0)
 DATA
 
 echo
@@ -14,9 +13,7 @@ echo
 
 ./run-dev0 <<DATA
 DevLinker1.LinkElfExe Linux blackbox := Kernel$+ Utf LinKernel Files LinEnv LinFiles LinGui StdLoader LinLoader
-Kernel.Quit(0)
 DATA
-chmod +x blackbox
 
 echo
 echo "linking interpreter"
@@ -24,6 +21,4 @@ echo
 
 ./run-dev0 <<DATA
 DevLinker1.LinkElfExe Linux blackboxInterp := Kernel$+ Utf LinKernel Files LinEnv LinFiles StdLoader LinIntLoader
-Kernel.Quit(0)
 DATA
-chmod +x blackboxInterp

build-obsd

@@ -5,7 +5,6 @@ echo
 
 ./run-dev0 <<DATA
 DevCompiler.CompileSubs @Obsd Obsd System Std Cons Text Form Dev Comm Fig Obx Raster
-Kernel.Quit(0)
 DATA
 
 echo
@@ -14,9 +13,7 @@ echo
 
 ./run-dev0 <<DATA
 DevLinker1.LinkElfExe OpenBSD blackbox := Kernel$+ Utf ObsdKernel Files ObsdEnv ObsdFiles ObsdGui StdLoader ObsdLoader
-Kernel.Quit(0)
 DATA
-chmod +x blackbox
 
 echo
 echo "linking interpreter"
@@ -24,6 +21,4 @@ echo
 
 ./run-dev0 <<DATA
 DevLinker1.LinkElfExe OpenBSD blackboxInterp := Kernel$+ Utf ObsdKernel Files ObsdEnv ObsdFiles StdLoader ObsdIntLoader
-Kernel.Quit(0)
 DATA
-chmod +x blackboxInterp

build-windows

@@ -5,7 +5,6 @@ echo
 
 ./run-dev0 <<DATA
 DevCompiler.CompileSubs @Win Com Comm Ctl Dev Form Ole Sql Std System Text Win Cons Mdi Fig Obx Raster
-Kernel.Quit(0)
 DATA
 
 echo
@@ -14,7 +13,6 @@ echo
 
 ./run-dev0 <<DATA
 DevLinker.Link BlackBox.exe := Kernel$+ Utf WinKernel Files WinEnv WinFiles WinGui StdLoader WinLoader 1 BlackBox.res 1 Applogo.ico 2 Applogo.ico 3 SFLogo.ico 4 CFLogo.ico 5 DtyLogo.ico 6 folderimg.ico 7 openimg.ico 8 leafimg.ico 1 Move.cur 2 Copy.cur 3 Link.cur 4 Pick.cur 5 Stop.cur 6 Hand.cur 7 Table.cur
-Kernel.Quit(0)
 DATA
 
 echo
@@ -23,7 +21,6 @@ echo
 
 ./run-dev0 <<DATA
 DevLinker.Link BlackBoxMDI.exe := Kernel$+ Utf WinKernel Files WinEnv WinFiles WinGui StdLoader MdiLoader 1 BlackBox.res 1 Applogo.ico 2 Doclogo.ico 3 SFLogo.ico 4 CFLogo.ico 5 DtyLogo.ico 6 folderimg.ico 7 openimg.ico 8 leafimg.ico 1 Move.cur 2 Copy.cur 3 Link.cur 4 Pick.cur 5 Stop.cur 6 Hand.cur 7 Table.cur
-Kernel.Quit(0)
 DATA
 
 echo
@@ -32,5 +29,4 @@ echo
 
 ./run-dev0 <<DATA
 DevLinker.Link BlackBoxInterp.exe := Kernel$+ Utf WinKernel Files WinEnv WinFiles StdLoader WinIntLoader
-Kernel.Quit(0)
 DATA

export-linux

@@ -6,6 +6,7 @@ if [ $# -eq 1 ]; then
 		mkdir "${outDir}"
 		pax -r -w -L \
 			-s ',.*/Xtras.*,,' \
+			-s ',.*__.bsd.*,,' -s ',.*__Win.*,,' \
 			Comm Cons Dev Docu Form Fig Obx Lin Sql Std System Text Xhtml blackbox blackboxInterp run-BlackBox run-BlackBoxInterp LICENSE.txt \
 			"${outDir}"
 	else

pack-dev0fbsd

@@ -3,6 +3,4 @@
 ./blackboxInterp <<DATA
 DevLinker1.LinkElfExe FreeBSD dev0fbsd := Kernel$+ Utf FbsdKernel Files FbsdEnv FbsdFiles FbsdPackedFiles StdLoader FbsdIntLoader
 DevPacker.PackThis dev0fbsd := Fbsd/Code/IntInit.ocf Fbsd/Code/Console.ocf System/Code/Console.ocf Std/Code/Registry.ocf Fbsd/Code/Registry.ocf Fbsd/Code/Lang.ocf System/Code/Dialog.ocf Cons/Code/Fonts.ocf System/Code/Fonts.ocf Cons/Code/Windows.ocf System/Code/Windows.ocf System/Code/Ports.ocf System/Code/Services.ocf System/Code/Stores.ocf System/Code/Strings.ocf System/Code/Math.ocf System/Code/Sequencers.ocf System/Code/Models.ocf System/Code/Views.ocf System/Code/Log.ocf System/Code/Converters.ocf System/Code/Meta.ocf System/Code/Controllers.ocf System/Code/Properties.ocf System/Code/Containers.ocf System/Code/Mechanisms.ocf System/Code/Documents.ocf System/Code/Dates.ocf System/Code/Printers.ocf System/Code/Printing.ocf Fbsd/Code/Dates.ocf Fbsd/Code/IntDialog.ocf Std/Code/Interpreter.ocf Std/Code/Dialog.ocf System/Code/Librarian.ocf Std/Code/Log.ocf Text/Code/Models.ocf Text/Code/Mappers.ocf Text/Code/Rulers.ocf Text/Code/Views.ocf Text/Code/Setters.ocf Text/Code/Controllers.ocf Cons/Code/Log.ocf Cons/Code/Interp.ocf Dev/Code/Commanders.ocf System/Code/Controls.ocf Std/Code/CFrames.ocf Dev/Code/Compiler.ocf Dev/Code/Markers.ocf Dev/Code/Selectors.ocf Dev/Code/CPM.ocf Dev/Code/CPT.ocf Dev/Code/CPB.ocf Dev/Code/CPP.ocf Dev/Code/CPS.ocf Dev/Code/CPE.ocf Dev/Code/CPV486.ocf Dev/Code/CPH.ocf Dev/Code/CPL486.ocf Dev/Code/CPC486.ocf Std/Code/TextConv.ocf Dev/Code/Linker.ocf Cons/Code/Compiler.ocf Std/Code/Api.ocf Std/Code/Cmds.ocf Std/Code/Links.ocf Dev/Code/Linker1.ocf Dev/Code/LnkBase.ocf Dev/Code/Chmod__Fbsd.ocf Dev/Code/LnkLoad.ocf Dev/Code/LnkWriteElf.ocf Dev/Code/LnkWriteElfStatic.ocf Dev/Code/LnkWritePe.ocf
-Kernel.Quit(0)
 DATA
-chmod +x dev0fbsd

pack-dev0lin

@@ -3,6 +3,5 @@
 ./blackboxInterp <<DATA
 DevLinker1.LinkElfExe Linux dev0lin := Kernel$+ Utf LinKernel Files LinEnv LinFiles LinPackedFiles StdLoader LinIntLoader
 DevPacker.PackThis dev0lin := Lin/Code/IntInit.ocf Lin/Code/Console.ocf System/Code/Console.ocf Std/Code/Registry.ocf Lin/Code/Registry.ocf Lin/Code/Lang.ocf System/Code/Dialog.ocf Cons/Code/Fonts.ocf System/Code/Fonts.ocf Cons/Code/Windows.ocf System/Code/Windows.ocf System/Code/Ports.ocf System/Code/Services.ocf System/Code/Stores.ocf System/Code/Strings.ocf System/Code/Math.ocf System/Code/Sequencers.ocf System/Code/Models.ocf System/Code/Views.ocf System/Code/Log.ocf System/Code/Converters.ocf System/Code/Meta.ocf System/Code/Controllers.ocf System/Code/Properties.ocf System/Code/Containers.ocf System/Code/Mechanisms.ocf System/Code/Documents.ocf System/Code/Dates.ocf System/Code/Printers.ocf System/Code/Printing.ocf Lin/Code/Dates.ocf Lin/Code/IntDialog.ocf Std/Code/Interpreter.ocf Std/Code/Dialog.ocf System/Code/Librarian.ocf Std/Code/Log.ocf Text/Code/Models.ocf Text/Code/Mappers.ocf Text/Code/Rulers.ocf Text/Code/Views.ocf Text/Code/Setters.ocf Text/Code/Controllers.ocf Cons/Code/Log.ocf Cons/Code/Interp.ocf Dev/Code/Commanders.ocf System/Code/Controls.ocf Std/Code/CFrames.ocf Dev/Code/Compiler.ocf Dev/Code/Markers.ocf Dev/Code/Selectors.ocf Dev/Code/CPM.ocf Dev/Code/CPT.ocf Dev/Code/CPB.ocf Dev/Code/CPP.ocf Dev/Code/CPS.ocf Dev/Code/CPE.ocf Dev/Code/CPV486.ocf Dev/Code/CPH.ocf Dev/Code/CPL486.ocf Dev/Code/CPC486.ocf Std/Code/TextConv.ocf Dev/Code/Linker.ocf Cons/Code/Compiler.ocf Std/Code/Api.ocf Std/Code/Cmds.ocf Std/Code/Links.ocf Dev/Code/Linker1.ocf Dev/Code/LnkBase.ocf Dev/Code/Chmod__Lin.ocf Dev/Code/LnkLoad.ocf Dev/Code/LnkWriteElf.ocf Dev/Code/LnkWriteElfStatic.ocf Dev/Code/LnkWritePe.ocf
-Kernel.Quit(0)
 DATA
-chmod +x dev0lin
+

pack-dev0obsd

@@ -3,6 +3,4 @@
 ./blackboxInterp <<DATA
 DevLinker1.LinkElfExe OpenBSD dev0obsd := Kernel$+ Utf ObsdKernel Files ObsdEnv ObsdFiles ObsdPackedFiles StdLoader ObsdIntLoader
 DevPacker.PackThis dev0obsd := Obsd/Code/IntInit.ocf Obsd/Code/Console.ocf System/Code/Console.ocf Std/Code/Registry.ocf Obsd/Code/Registry.ocf Obsd/Code/Lang.ocf System/Code/Dialog.ocf Cons/Code/Fonts.ocf System/Code/Fonts.ocf Cons/Code/Windows.ocf System/Code/Windows.ocf System/Code/Ports.ocf System/Code/Services.ocf System/Code/Stores.ocf System/Code/Strings.ocf System/Code/Math.ocf System/Code/Sequencers.ocf System/Code/Models.ocf System/Code/Views.ocf System/Code/Log.ocf System/Code/Converters.ocf System/Code/Meta.ocf System/Code/Controllers.ocf System/Code/Properties.ocf System/Code/Containers.ocf System/Code/Mechanisms.ocf System/Code/Documents.ocf System/Code/Dates.ocf System/Code/Printers.ocf System/Code/Printing.ocf Obsd/Code/Dates.ocf Obsd/Code/IntDialog.ocf Std/Code/Interpreter.ocf Std/Code/Dialog.ocf System/Code/Librarian.ocf Std/Code/Log.ocf Text/Code/Models.ocf Text/Code/Mappers.ocf Text/Code/Rulers.ocf Text/Code/Views.ocf Text/Code/Setters.ocf Text/Code/Controllers.ocf Cons/Code/Log.ocf Cons/Code/Interp.ocf Dev/Code/Commanders.ocf System/Code/Controls.ocf Std/Code/CFrames.ocf Dev/Code/Compiler.ocf Dev/Code/Markers.ocf Dev/Code/Selectors.ocf Dev/Code/CPM.ocf Dev/Code/CPT.ocf Dev/Code/CPB.ocf Dev/Code/CPP.ocf Dev/Code/CPS.ocf Dev/Code/CPE.ocf Dev/Code/CPV486.ocf Dev/Code/CPH.ocf Dev/Code/CPL486.ocf Dev/Code/CPC486.ocf Std/Code/TextConv.ocf Dev/Code/Linker.ocf Cons/Code/Compiler.ocf Std/Code/Api.ocf Std/Code/Cmds.ocf Std/Code/Links.ocf Dev/Code/Linker1.ocf Dev/Code/LnkBase.ocf Dev/Code/Chmod__Obsd.ocf Dev/Code/LnkLoad.ocf Dev/Code/LnkWriteElf.ocf Dev/Code/LnkWriteElfStatic.ocf Dev/Code/LnkWritePe.ocf
-Kernel.Quit(0)
 DATA
-chmod +x dev0obsd

packaging/Arch/PKGBUILD

@@ -28,14 +28,11 @@ _append_build_info() {
 
 	./run-dev0 <<DATA
 DevCompiler.CompileSubs Deb
-Kernel.Quit(0)
 DATA
 
 	./run-dev0 <<DATA
 DevLinker1.LinkElf `uname -s` append := Kernel$+ Utf LinKernel Files LinEnv LinFiles Math Strings Meta Log Services Fonts Dialog Ports Stores Sequencers Converters Models Views StdInterpreter Console LinConsole ConsFonts Controllers Properties Mechanisms Containers Dates Printers Printing Documents Windows ConsWindows LinDates LinIntDialog StdRegistry StdDialog  TextModels TextMappers TextRulers TextSetters TextViews TextControllers ConsLog StdApi StdCmds StdCoder DebAppend
-Kernel.Quit(0)
 DATA
-	chmod +x append
 
 	version=`cat version.txt`
 	buildNum=`pkgver`

packaging/Deb/makePackage

@@ -4,7 +4,7 @@
 # run ./makePackage n 
 # n - is build number
 
-declare -a arr=("Comm" "Cons" "Dev" "Docu" "Form" "Fig" "Lin" "Obx" "Std" "Sql" "System" "Text" "blackbox" "LICENSE.txt" "run-BlackBox")
+# declare -a arr=("Comm" "Cons" "Dev" "Docu" "Form" "Fig" "Lin" "Obx" "Std" "Sql" "System" "Text" "blackbox" "LICENSE.txt" "run-BlackBox")
 
 version=`cat ../../version.txt`
 buildNum=$@
@@ -17,16 +17,20 @@ verArr=(${version//-/ })
 debVersion=${verArr[0]}'~'${verArr[1]}'.build'$buildNum
 echo "$debVersion"
 
-rm build -r
-cp template build -r
+rm -rf build
+cp -r template build
 
 mkdir "build/usr/lib"
-mkdir "build/usr/lib/blackbox2"
-for i in "${arr[@]}"
-do
-    cp -r '../../'$i 'build/usr/lib/blackbox2'
-done
-rm "build/usr/lib/blackbox2/Lin/Xtras" -r
+# mkdir "build/usr/lib/blackbox2"
+#for i in "${arr[@]}"
+#do
+#    cp -r '../../'$i 'build/usr/lib/blackbox2'
+#done
+cd ../..
+./export-linux "packaging/Deb/build/usr/lib/blackbox2"
+cd packaging/Deb
+
+# rm "build/usr/lib/blackbox2/Lin/Xtras" -r
 
 cp changelog changelogTmp
 sed -i -e 's/#VERSION#/'$debVersion'/g' changelogTmp
@@ -40,10 +44,13 @@ env FILEPATH="build/usr/lib/blackbox2/System/Rsrc" FILENAME="Strings.odc" KEY="b
 cd build
 find . -type f -exec chmod 644 {} ";"
 find . -type d -exec chmod 755 {} ";"
-chmod +x usr/bin/bbcb2
 chmod +x usr/bin/bbcb2-shortcut 
 chmod +x usr/lib/blackbox2/blackbox 
 chmod +x usr/lib/blackbox2/run-BlackBox
+chmod +x usr/lib/blackbox2/blackboxInterp
+chmod +x usr/lib/blackbox2/run-BlackBoxInterp
+ln -s ../lib/blackbox2/run-BlackBox usr/bin/bbcb2
+ln -s ../lib/blackbox2/run-BlackBoxInterp usr/bin/bbcb2-cli
 
 cd ../
 

packaging/Deb/template/usr/bin/bbcb2

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-standardDir="/usr/lib/blackbox2"
-useDir=`readlink -f .`
-
-# fix Ubuntu-specific problems:
-unset UBUNTU_MENUPROXY
-unset GTK_MODULES
-export LIBOVERLAY_SCROLLBAR=0
-
-# export LD_DEBUG=all
-env \
-	BB_STANDARD_DIR="${standardDir}" BB_USE_DIR="${useDir}" \
-	"${standardDir}"/blackbox $@