Explorar el Código

merge new Kernel structure from Anton Dmitriev, rebuild console compilers for Linux and Windows, compiler always COM aware

Ivan Denisov hace 3 años
padre
commit
f608c5f60a
Se han modificado 59 ficheros con 78 adiciones y 39 borrados
  1. BIN
      BlackBox/Cons/Mod/Fonts.odc
  2. BIN
      BlackBox/Cons/Mod/Windows.odc
  3. BIN
      BlackBox/Dev/Mod/CPM.odc
  4. BIN
      BlackBox/Dev/Mod/Compiler.odc
  5. 0 0
      BlackBox/Fbsd/Mod/KernelFreeBSD.odc
  6. BIN
      BlackBox/Kernel/Mod/KernelLinux.odc
  7. BIN
      BlackBox/Kernel/Mod/KernelWindows.odc
  8. BIN
      BlackBox/Lin/Mod/Dialog.odc
  9. BIN
      BlackBox/Lin/Mod/Env.odc
  10. BIN
      BlackBox/Lin/Mod/Gui.odc
  11. BIN
      BlackBox/Lin/Mod/Init.odc
  12. BIN
      BlackBox/Lin/Mod/Kernel.odc
  13. BIN
      BlackBox/Lincons/Mod/Dialog.odc
  14. BIN
      BlackBox/Lincons/Mod/Init.odc
  15. BIN
      BlackBox/Lincons/Mod/Loader.odc
  16. BIN
      BlackBox/Linint/Mod/Dialog.odc
  17. BIN
      BlackBox/Linint/Mod/Init.odc
  18. BIN
      BlackBox/Linint/Mod/Loader.odc
  19. 0 0
      BlackBox/Obsd/Mod/KernelOpenBSD.odc
  20. BIN
      BlackBox/Std/Mod/Lib.odc
  21. BIN
      BlackBox/Std/Mod/Librarian.odc
  22. BIN
      BlackBox/Std/Mod/Log.odc
  23. 0 1
      BlackBox/System/Code
  24. BIN
      BlackBox/System/Mod/Dialog.odc
  25. BIN
      BlackBox/System/Mod/Kernel.odc
  26. 0 1
      BlackBox/System/Sym
  27. BIN
      BlackBox/Win/Mod/Config.odc
  28. BIN
      BlackBox/Win/Mod/Dialog.odc
  29. BIN
      BlackBox/Win/Mod/Files.odc
  30. BIN
      BlackBox/Win/Mod/Files64.odc
  31. BIN
      BlackBox/Win/Mod/Init.odc
  32. BIN
      BlackBox/Win/Mod/Kernel.odc
  33. BIN
      BlackBox/Win/Mod/TextConv.odc
  34. BIN
      BlackBox/Win/Mod/Windows.odc
  35. BIN
      BlackBox/Wincons/Dev/Mod/ComDebug.odc
  36. BIN
      BlackBox/Wincons/Host/Mod/Lang.odc
  37. BIN
      BlackBox/Wincons/Host/Mod/TextConv.odc
  38. BIN
      BlackBox/Wincons/System/Mod/Config.odc
  39. 0 5
      BlackBox/Wincons/build-dev0.bat
  40. 0 6
      BlackBox/Wincons/build.bat
  41. BIN
      BlackBox/Wincons/build.odc
  42. 0 9
      BlackBox/Wincons/pack-dev0.bat
  43. BIN
      BlackBox/Wincons/pack-dev0.odc
  44. BIN
      BlackBox/Winint/Mod/Dialog.odc
  45. BIN
      BlackBox/Winint/Mod/Init.odc
  46. BIN
      BlackBox/Winint/Mod/Loader.odc
  47. 12 2
      BlackBox/build-linux-gui
  48. 14 3
      BlackBox/build-linux-interp
  49. 0 2
      BlackBox/build-win-gui
  50. 19 0
      BlackBox/build-windows-gui
  51. 1 2
      BlackBox/build-windows-gui.bat
  52. 19 0
      BlackBox/build-windows-interp
  53. 6 0
      BlackBox/build-windows-interp.bat
  54. 0 1
      BlackBox/clean
  55. BIN
      BlackBox/dev0lin
  56. BIN
      BlackBox/dev0win.exe
  57. 0 7
      BlackBox/pack-dev0
  58. 7 0
      BlackBox/pack-dev0lin
  59. BIN
      BlackBox/pack-dev0win.odc

BIN
BlackBox/Lincons/Mod/Fonts.odc → BlackBox/Cons/Mod/Fonts.odc


BIN
BlackBox/Lincons/Mod/Windows.odc → BlackBox/Cons/Mod/Windows.odc


BIN
BlackBox/Dev/Mod/CPM.odc


BIN
BlackBox/Dev/Mod/Compiler.odc


+ 0 - 0
BlackBox/Kernel/Mod/KernelFreeBSD.odc → BlackBox/Fbsd/Mod/KernelFreeBSD.odc


BIN
BlackBox/Kernel/Mod/KernelLinux.odc


BIN
BlackBox/Kernel/Mod/KernelWindows.odc


BIN
BlackBox/Lin/Mod/Dialog.odc


BIN
BlackBox/Lin/Mod/Env.odc


BIN
BlackBox/Lin/Mod/Gui.odc


BIN
BlackBox/Lin/Mod/Init.odc


BIN
BlackBox/Lin/Mod/Kernel.odc


BIN
BlackBox/Lincons/Mod/Dialog.odc


BIN
BlackBox/Lincons/Mod/Init.odc


BIN
BlackBox/Lincons/Mod/Loader.odc


BIN
BlackBox/Linint/Mod/Dialog.odc


BIN
BlackBox/Linint/Mod/Init.odc


BIN
BlackBox/Linint/Mod/Loader.odc


+ 0 - 0
BlackBox/Kernel/Mod/KernelOpenBSD.odc → BlackBox/Obsd/Mod/KernelOpenBSD.odc


BIN
BlackBox/Std/Mod/Lib.odc


BIN
BlackBox/Std/Mod/Librarian.odc


BIN
BlackBox/Std/Mod/Log.odc


+ 0 - 1
BlackBox/System/Code

@@ -1 +0,0 @@
-../Code

BIN
BlackBox/System/Mod/Dialog.odc


BIN
BlackBox/System/Mod/Kernel.odc


+ 0 - 1
BlackBox/System/Sym

@@ -1 +0,0 @@
-../Sym

BIN
BlackBox/Win/Mod/Config.odc


BIN
BlackBox/Win/Mod/Dialog.odc


BIN
BlackBox/Win/Mod/Files.odc


BIN
BlackBox/Win/Mod/Files64.odc


BIN
BlackBox/Win/Mod/Init.odc


BIN
BlackBox/Win/Mod/Kernel.odc


BIN
BlackBox/Win/Mod/TextConv.odc


BIN
BlackBox/Win/Mod/Windows.odc


BIN
BlackBox/Wincons/Dev/Mod/ComDebug.odc


BIN
BlackBox/Wincons/Host/Mod/Lang.odc


BIN
BlackBox/Wincons/Host/Mod/TextConv.odc


BIN
BlackBox/Wincons/System/Mod/Config.odc


+ 0 - 5
BlackBox/Wincons/build-dev0.bat

@@ -1,5 +0,0 @@
-@echo off
-@echo DevLinker.Link dos dev0new.exe := Kernel$+ Files Utf HostEnv HostFiles HostPackedFiles StdLoader >> tmp.txt
-@echo Kernel.Quit(0) >> tmp.txt
-dev0.exe -BB_PACKED_FIRST < tmp.txt
-del tmp.txt

+ 0 - 6
BlackBox/Wincons/build.bat

@@ -1,6 +0,0 @@
-@echo off
-@echo DevCompiler.CompileSubs Win Sql System Std Host Cons Text Form Dev Xhtml Comm Obx > tmp.txt
-@echo DevLinker.Link dos BlackBoxInterp.exe := Kernel$+ Files Utf HostEnv HostFiles StdLoader >> tmp.txt
-@echo Kernel.Quit(0) >> tmp.txt
-dev0.exe -BB_PACKED_FIRST < tmp.txt
-del tmp.txt

BIN
BlackBox/Wincons/build.odc


+ 0 - 9
BlackBox/Wincons/pack-dev0.bat

@@ -1,9 +0,0 @@
-@echo off
-copy dev0new.exe tmp.exe
-@echo DevCompiler.CompileThis HostPackedFiles DevPacker > tmp.txt
-@echo DevPacker.PackThis dev0new.exe := Code/Init.ocf Code/Unicode.ocf Host/Code/Console.ocf Code/Console.ocf Host/Code/Lang.ocf Code/Dialog.ocf Host/Code/Fonts.ocf Code/Fonts.ocf Host/Code/Windows.ocf Code/Windows.ocf Code/Ports.ocf Code/Services.ocf Code/Stores.ocf Code/Strings.ocf Code/Math.ocf Code/Sequencers.ocf Code/Models.ocf Code/Views.ocf Code/Log.ocf Code/Converters.ocf Code/Meta.ocf Code/Controllers.ocf Code/Properties.ocf Code/Containers.ocf Code/Mechanisms.ocf Code/Documents.ocf Code/Dates.ocf Code/Printers.ocf Code/Printing.ocf Host/Code/Dates.ocf Host/Code/Dialog.ocf Std/Code/Interpreter.ocf Std/Code/Dialog.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 Code/Config.ocf Cons/Code/Interp.ocf Dev/Code/Commanders.ocf 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 Host/Code/TextConv.ocf Dev/Code/Linker.ocf Cons/Code/Compiler.ocf Host/Code/Registry.ocf Dev/Code/References.ocf Dev/Code/Debug.ocf Dev/Code/ComDebug.ocf >> tmp.txt
-@echo Kernel.Quit(0) >> tmp.txt
-tmp.exe < tmp.txt
-del tmp.txt
-del tmp.exe
-

BIN
BlackBox/Wincons/pack-dev0.odc


BIN
BlackBox/Winint/Mod/Dialog.odc


BIN
BlackBox/Winint/Mod/Init.odc


BIN
BlackBox/Winint/Mod/Loader.odc


+ 12 - 2
BlackBox/build-linux-gui

@@ -1,9 +1,19 @@
 #!/bin/sh
+
+echo "cleaning"
+
 ./clean
+
+echo "compiling"
+
 ./run-dev0 <<DATA
-DevCompiler.CompileThis Unicode LinLibc LinLibW LinDl LinRt KernelKernelLinux
 DevCompiler.CompileSubs Lin System Std Cons Var Text Form Dev Dev2 Tyler
+Kernel.Quit(0)
+DATA
 
-Dev2Linker1.LinkElfExe `uname -s` blackbox := Unicode Kernel$+ Files Utf LinEnv LinFiles LinGui StdLoader LinLoader
+echo "linking"
 
+./run-dev0 <<DATA
+Dev2Linker1.LinkElfExe `uname -s` blackbox := Unicode Kernel$+ Files Utf LinEnv LinFiles LinGui StdLoader LinLoader
+Kernel.Quit(0)
 DATA

+ 14 - 3
BlackBox/build-linux-interp

@@ -1,9 +1,20 @@
 #!/bin/sh
 
+echo "cleaning"
+
+./clean
+
+echo "compiling"
+
 ./run-dev0 <<DATA
-DevCompiler.CompileThis Unicode LinLibc LinLibW LinDl LinRt KernelKernelLinux
-DevCompiler.CompileSubs Lin System Std Cons Var Text Form Dev Dev2 Tyler
+DevCompiler.CompileSubs Lin System Std Cons Var Text Form Dev Dev2 Linint
+Kernel.Quit(0)
+DATA
 
-Dev2Linker1.LinkElfExe `uname -s` blackbox := Unicode Kernel$+ Files Utf LinEnv LinFiles StdLoader InterpLoader
+echo "linking"
 
+./run-dev0 <<DATA
+Dev2Linker1.LinkElfExe `uname -s` blackbox := Unicode Kernel$+ Files Utf LinEnv LinFiles StdLoader LinintLoader
+Kernel.Quit(0)
 DATA
+

+ 0 - 2
BlackBox/build-win-gui

@@ -1,2 +0,0 @@
-#!/bin/bash
-wine cmd.exe /C build-windows-gui.bat

+ 19 - 0
BlackBox/build-windows-gui

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+echo "cleaning"
+
+./clean
+
+echo "compiling"
+
+./run-dev0 <<DATA
+DevCompiler.CompileSubs Com Comm Ctl Dev Form Ole Sql Std System Text Win Cons
+Kernel.Quit(0)
+DATA
+
+echo "linking"
+
+./run-dev0 <<DATA
+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
+Kernel.Quit(0)
+DATA

+ 1 - 2
BlackBox/build-windows-gui.bat

@@ -1,7 +1,6 @@
 @echo off
-@echo DevCompiler.CompileThis WinApi WinOle Unicode KernelKernelWindows >> tmp.txt
 @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 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 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 Kernel.Quit(0) >> tmp.txt
 dev0win.exe /BB_PACKED_FIRST < tmp.txt
 del tmp.txt

+ 19 - 0
BlackBox/build-windows-interp

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+echo "cleaning"
+
+./clean
+
+echo "compiling"
+
+./run-dev0 <<DATA
+DevCompiler.CompileSubs Com Comm Ctl Dev Form Ole Sql Std System Text Win Cons Winint
+Kernel.Quit(0)
+DATA
+
+echo "linking"
+
+./run-dev0 <<DATA
+DevLinker.Link BlackBox.exe := Unicode Kernel$+ Files Utf WinKernel WinEnv WinFiles StdLoader WinintLoader
+Kernel.Quit(0)
+DATA

+ 6 - 0
BlackBox/build-windows-interp.bat

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

+ 0 - 1
BlackBox/clean

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 find . -type f -name "*.ocf" -exec rm -f {} \;
 find . -type f -name "*.osf" -exec rm -f {} \;
 find . -type f -name "*~" -exec rm -f {} \;

BIN
BlackBox/dev0lin


BIN
BlackBox/dev0win.exe


+ 0 - 7
BlackBox/pack-dev0

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-./run-BlackBox <<DATA
-Dev2Linker1.LinkElfExe `uname -s` dev0 := Kernel$+ Files Utf HostEnv HostFiles HostPackedFiles StdLoader
-DevPacker.PackThis dev0 := Code/Init.ocf Code/Unicode.ocf Host/Code/Console.ocf Code/Console.ocf Host/Code/Registry.ocf Host/Code/Lang.ocf Code/Dialog.ocf Host/Code/Fonts.ocf Code/Fonts.ocf Host/Code/Windows.ocf Code/Windows.ocf Code/Ports.ocf Code/Services.ocf Code/Stores.ocf Code/Strings.ocf Code/Math.ocf Code/Sequencers.ocf Code/Models.ocf Code/Views.ocf Code/Log.ocf Code/Converters.ocf Code/Meta.ocf Code/Controllers.ocf Code/Properties.ocf Code/Containers.ocf Code/Mechanisms.ocf Code/Documents.ocf Code/Dates.ocf Code/Printers.ocf Code/Printing.ocf Host/Code/Dates.ocf Host/Code/Dialog.ocf Std/Code/Interpreter.ocf Std/Code/Dialog.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 Code/Config.ocf Cons/Code/Interp.ocf Dev/Code/Commanders.ocf 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 Host/Code/TextConv.ocf Dev/Code/Linker.ocf Cons/Code/Compiler.ocf Std/Code/Api.ocf Std/Code/Cmds.ocf Std/Code/Links.ocf Dev2/Code/Linker.ocf Dev2/Code/Linker1.ocf Dev2/Code/LnkBase.ocf Dev2/Code/LnkChmod.ocf Dev2/Code/LnkLoad.ocf Dev2/Code/LnkWriteElf.ocf Dev2/Code/LnkWriteElfStatic.ocf Dev2/Code/LnkWritePe.ocf 
-
-DATA

+ 7 - 0
BlackBox/pack-dev0lin

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+./run-BlackBox <<DATA
+Dev2Linker1.LinkElfExe `uname -s` dev0 := Unicode Kernel$+ Files Utf LinEnv LinFiles LinPackedFiles StdLoader LinintLoader
+LinPacker.PackThis dev0 := Lin/Code/Kernel.ocf Linint/Code/Init.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 Linint/Code/Dialog.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 Dev2/Code/Linker.ocf Dev2/Code/Linker1.ocf Dev2/Code/LnkBase.ocf Lin/Code/Chmod.ocf Dev2/Code/LnkLoad.ocf Dev2/Code/LnkWriteElf.ocf Dev2/Code/LnkWriteElfStatic.ocf Dev2/Code/LnkWritePe.ocf 
+Kernel.Quit(0)
+DATA

BIN
BlackBox/pack-dev0win.odc