2
0
Ivan Denisov 3 жил өмнө
parent
commit
d0bc2f338d

BIN
Dev/Mod/Compiler.odc


BIN
Dev/Mod/LnkBase.odc


BIN
Std/Mod/Cmds.odc


+ 2 - 2
build-linux

@@ -10,14 +10,14 @@ DATA
 echo "\nlinking gui\n"
 
 ./run-dev0 <<DATA
-DevLinker1.LinkElfExe Linux blackbox := Kernel$+ LinKernel Files Utf LinEnv LinFiles LinGui StdLoader LinLoader
+DevLinker1.LinkElfExe Linux blackbox := Kernel$+ Utf LinKernel Files LinEnv LinFiles LinGui StdLoader LinLoader
 Kernel.Quit(0)
 DATA
 
 echo "\nlinking interp\n"
 
 ./run-dev0 <<DATA
-DevLinker1.LinkElfExe Linux blackboxInterp := Kernel$+ LinKernel Files Utf LinEnv LinFiles StdLoader LinIntLoader
+DevLinker1.LinkElfExe Linux blackboxInterp := Kernel$+ Utf LinKernel Files LinEnv LinFiles StdLoader LinIntLoader
 Kernel.Quit(0)
 DATA
 

+ 2 - 2
build-windows

@@ -10,13 +10,13 @@ DATA
 echo "\nlinking gui\n"
 
 ./run-dev0 <<DATA
-DevLinker.Link BlackBox.exe := Kernel$+ Files Utf WinKernel WinEnv WinFiles WinGui StdLoader WinLoader 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
+DevLinker.Link BlackBox.exe := Kernel$+ Utf WinKernel Files WinEnv WinFiles WinGui StdLoader WinLoader 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 "\nlinking interp\n"
 
 ./run-dev0 <<DATA
-DevLinker.Link BlackBoxInterp.exe := Kernel$+ Files Utf WinKernel WinEnv WinFiles StdLoader WinIntLoader
+DevLinker.Link BlackBoxInterp.exe := Kernel$+ Utf WinKernel Files WinEnv WinFiles StdLoader WinIntLoader
 Kernel.Quit(0)
 DATA

+ 2 - 2
build-windows.bat

@@ -1,7 +1,7 @@
 @echo off
 @echo DevCompiler.CompileSubs Com Comm Ctl Dev Form Ole Sql Std System Text Win Cons >> tmp.txt
-@echo DevLinker.Link BlackBox.exe := Unicode Kernel$+ Files Utf WinKernel WinEnv WinFiles WinGui StdLoader WinLoader 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 >> tmp.txt
-@echo DevLinker.Link BBInt.exe := Kernel$+ Files Utf WinKernel WinEnv WinFiles StdLoader WinIntLoader >> tmp.txt
+@echo DevLinker.Link BlackBox.exe := Unicode Kernel$+ Utf WinKernel Files WinEnv WinFiles WinGui StdLoader WinLoader 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 >> tmp.txt
+@echo DevLinker.Link BBInt.exe := Kernel$+ Utf WinKernel Files WinEnv WinFiles StdLoader WinIntLoader >> tmp.txt
 @echo Kernel.Quit(0) >> tmp.txt
 dev0win.exe /BB_PACKED_FIRST < tmp.txt
 del tmp.txt

BIN
dev0lin


BIN
dev0win.exe


+ 2 - 2
pack-dev0lin

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ./blackboxInterp <<DATA
-DevLinker1.LinkElfExe `uname -s` dev0 := Kernel$+ Files Utf LinEnv LinFiles LinPackedFiles StdLoader LinIntLoader
-LinPacker.PackThis dev0 := Lin/Code/Kernel.ocf Lin/Code/IntInit.ocf Lin/Code/Console.ocf System/Code/Console.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 Std/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/ETHConv.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 Lin/Code/Chmod.ocf Dev/Code/LnkLoad.ocf Dev/Code/LnkWriteElf.ocf Dev/Code/LnkWriteElfStatic.ocf Dev/Code/LnkWritePe.ocf 
+DevLinker1.LinkElfExe `uname -s` dev0 := Kernel$+ Utf LinKernel Files LinEnv LinFiles LinPackedFiles StdLoader LinIntLoader
+LinPacker.PackThis dev0 := Lin/Code/IntInit.ocf Lin/Code/Console.ocf System/Code/Console.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 Std/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/ETHConv.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 Lin/Code/Chmod.ocf Dev/Code/LnkLoad.ocf Dev/Code/LnkWriteElf.ocf Dev/Code/LnkWriteElfStatic.ocf Dev/Code/LnkWritePe.ocf 
 Kernel.Quit(0)
 DATA

BIN
pack-dev0win.odc


+ 1 - 2
run-BlackBox

@@ -4,7 +4,7 @@
 # ulimit -a
 
 rn=`readlink -f "${0}"`
-standardDir=`dirname "${rn}"`
+standardDir="/home/ivan/oberon/20devBack"
 useDir=`readlink -f .`
 
 exe="blackbox"
@@ -17,5 +17,4 @@ export LIBOVERLAY_SCROLLBAR=0
 # export LD_DEBUG=all
 exec env \
 	BB_STANDARD_DIR="${standardDir}" BB_USE_DIR="${useDir}" \
-	BB_PACKED_NAME="${exe}" \
 	"${standardDir}"/${exe} "${@}"