Bladeren bron

remove extra Kernel.Quit calls, rebuild dev0 files for all platforms

Ivan Denisov 1 jaar geleden
bovenliggende
commit
2f25cdde76
21 gewijzigde bestanden met toevoegingen van 2 en 29 verwijderingen
  1. BIN
      Fbsd/Mod/Init.odc
  2. BIN
      Fbsd/Mod/IntInit.odc
  3. BIN
      Lin/Mod/Init.odc
  4. BIN
      Lin/Mod/IntInit.odc
  5. BIN
      Obsd/Mod/Init.odc
  6. BIN
      Obsd/Mod/IntInit.odc
  7. BIN
      Win/Mod/Init.odc
  8. BIN
      Win/Mod/IntInit.odc
  9. 0 5
      build-fbsd
  10. 0 5
      build-linux
  11. 0 5
      build-obsd
  12. 0 4
      build-windows
  13. 1 1
      build-windows.bat
  14. BIN
      dev0fbsd
  15. BIN
      dev0lin
  16. BIN
      dev0obsd
  17. BIN
      dev0win.exe
  18. 0 2
      pack-dev0fbsd
  19. 1 2
      pack-dev0lin
  20. 0 2
      pack-dev0obsd
  21. 0 3
      packaging/Arch/PKGBUILD

BIN
Fbsd/Mod/Init.odc


BIN
Fbsd/Mod/IntInit.odc


BIN
Lin/Mod/Init.odc


BIN
Lin/Mod/IntInit.odc


BIN
Obsd/Mod/Init.odc


BIN
Obsd/Mod/IntInit.odc


BIN
Win/Mod/Init.odc


BIN
Win/Mod/IntInit.odc


+ 0 - 5
build-fbsd

@@ -5,7 +5,6 @@ echo
 
 ./run-dev0 <<DATA
 DevCompiler.CompileSubs @Fbsd Fbsd System Std Cons Text Form Dev Comm Fig Obx
-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

+ 0 - 5
build-linux

@@ -5,7 +5,6 @@ echo
 
 ./run-dev0 <<DATA
 DevCompiler.CompileSubs @Lin Lin System Std Cons Text Form Dev Comm Fig Obx
-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

+ 0 - 5
build-obsd

@@ -5,7 +5,6 @@ echo
 
 ./run-dev0 <<DATA
 DevCompiler.CompileSubs @Obsd Obsd System Std Cons Text Form Dev Comm Fig Obx
-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

+ 0 - 4
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
-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

+ 1 - 1
build-windows.bat

@@ -1,5 +1,5 @@
 @echo off
-@echo DevCompiler.CompileSubs @Win Com Comm Ctl Dev Form Ole Sql Std System Text Win Cons Mdi Fig >> tmp.txt
+@echo DevCompiler.CompileSubs @Win Com Comm Ctl Dev Form Ole Sql Std System Text Win Cons Mdi Fig > tmp.txt
 @echo 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 >> tmp.txt
 @echo 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 >> tmp.txt
 @echo DevLinker.Link BlackBoxInterp.exe := Kernel$+ Utf WinKernel Files WinEnv WinFiles StdLoader WinIntLoader >> tmp.txt

BIN
dev0fbsd


BIN
dev0lin


BIN
dev0obsd


BIN
dev0win.exe


+ 0 - 2
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

+ 1 - 2
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
+

+ 0 - 2
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

+ 0 - 3
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`