build scripts simplified

diff --git a/new/README b/new/README
index 9c8b9aab6a50f7f4c95ab919abb183466ea02441..0c7d6e74181c614fcf919e70488e727b1e00ecdf 100644 (file)
--- a/new/README
+++ b/new/README
@@ -1,2 +1,3 @@
-./build-gui
+./switch-target `uname -s` GUI
+./build
 ./run-BlackBox

diff --git a/new/_LinuxOpenBSD_GUI/build b/new/_LinuxOpenBSD_GUI/build
new file mode 100755 (executable)
index 0000000..f5ecfe3
--- /dev/null
+++ b/new/_LinuxOpenBSD_GUI/build
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+./run-dev0 <<DATA
+ConsCompiler.Compile('Lin/Mod', 'Dl.txt')
+ConsCompiler.Compile('Lin/Mod', 'Libc.txt')
+ConsCompiler.Compile('Lin/Mod', 'Iconv.txt')
+
+DevCompiler.CompileThis Kernel Files HostFiles StdLoader
+DevCompiler.CompileThis Math Strings Dates Meta Dialog Services Fonts Ports Stores Log Converters Sequencers Models Printers Views Controllers Properties Printing Mechanisms Containers Documents Windows
+DevCompiler.CompileThis StdCFrames Controls StdDialog StdApi StdCmds StdInterpreter
+
+DevCompiler.CompileThis HostDates HostLang HostRegistry HostUtf8
+
+DevCompiler.CompileThis Console HostConsole
+
+DevCompiler.CompileThis TextModels TextRulers TextSetters TextViews TextControllers TextMappers TextCmds
+
+DevCompiler.CompileThis Gtk2GLib Gtk2GObject Gtk2Keysyms Gtk2Pango Gtk2Gdk Gtk2Gtk Gtk2Util
+
+DevCompiler.CompileThis HostFonts HostPorts HostMechanisms HostWindows HostClipboard HostCFrames HostDialog HostCmds
+
+DevCompiler.CompileThis StdLog
+
+DevCompiler.CompileThis ConsLog
+
+DevCompiler.CompileThis FormModels FormViews FormControllers FormGen FormCmds
+
+DevCompiler.CompileThis StdTables StdTabViews HostTabFrames
+
+DevCompiler.CompileThis HostTextConv
+
+DevCompiler.CompileThis HostMenus
+
+DevCompiler.CompileThis StdFolds StdLinks StdDebug StdMenuTool StdClocks StdStamps StdLogos StdCoder StdScrollers
+
+DevCompiler.CompileThis In Out Integers
+
+DevCompiler.CompileThis Config Init
+
+### Dev:
+DevCompiler.CompileThis DevMarkers DevCommanders DevSelectors DevCPM DevCPT DevCPH DevCPB DevCPE DevCPS DevCPP DevCPL486 DevCPC486 DevCPV486 DevCompiler DevElfLinker16 DevLinker
+DevCompiler.CompileThis ConsInterp ConsCompiler
+DevCompiler.CompileThis DevAlienTool DevDebug DevDependencies DevHeapSpy DevInspector DevLinkChk DevMsgSpy DevRBrowser DevReferences DevSearch DevSubTool DevCmds DevBrowser
+DevCompiler.CompileThis HostPackedFiles DevPacker
+
+### Xhtml:
+DevCompiler.CompileThis XhtmlEntitySets XhtmlWriters XhtmlStdFileWriters XhtmlTextTableMarkers XhtmlExporter
+
+### Comm:
+DevCompiler.CompileThis CommStreams
+ConsCompiler.Compile('Lin/Mod', 'Termios.txt')
+ConsCompiler.Compile('Lin/Mod', 'Ioctl.txt')
+ConsCompiler.Compile('Lin/Mod', 'Net.txt')
+DevCompiler.CompileThis CommV24 CommTCP
+
+### Obx:
+DevCompiler.CompileThis ObxHello0 ObxPi ObxRandom ObxTrap
+DevCompiler.CompileThis ObxActions ObxAddress0 ObxAddress1 ObxAddress2 ObxAscii ObxBlackBox ObxButtons ObxCalc ObxCaps ObxContIter ObxControlShifter ObxControls ObxConv ObxCount0 ObxCount1 ObxCubes ObxDb ObxDialog ObxFact ObxFileTree ObxFldCtrls ObxGraphs ObxHello1 ObxLabelLister ObxLines ObxLinks ObxMMerge ObxOmosi ObxOpen0 ObxOpen1 ObxOrders ObxParCmd ObxPatterns ObxRatcalc ObxSample ObxScroll ObxStores ObxTabViews ObxTabs ObxTickers ObxTwins ObxUnitConv ObxViews0 ObxViews1 ObxViews10 ObxViews11 ObxViews12 ObxViews13 ObxViews14 ObxViews2 ObxViews3 ObxViews4 ObxViews5 ObxViews6 ObxWrappers
+DevCompiler.CompileThis ObxPhoneDB ObxPhoneUI ObxPhoneUI1 ObxLookup0 ObxLookup1 ObxPDBRep0 ObxPDBRep1 ObxPDBRep2 ObxPDBRep3 ObxPDBRep4
+
+# TRAP:
+#DevCompiler.CompileThis ObxCtrls
+DATA

diff --git a/new/_LinuxOpenBSD_Interp/Host/Mod/DevPackedFiles.odc b/new/_LinuxOpenBSD_Interp/Host/Mod/DevPackedFiles.odc
new file mode 100644 (file)
index 0000000..ded0d9c
Binary files /dev/null and b/new/_LinuxOpenBSD_Interp/Host/Mod/DevPackedFiles.odc differ

diff --git a/new/build b/new/_LinuxOpenBSD_Interp/build
similarity index 100%
rename from new/build
rename to new/_LinuxOpenBSD_Interp/build

diff --git a/new/_LinuxOpenBSD_Interp/pack-dev0 b/new/_LinuxOpenBSD_Interp/pack-dev0
new file mode 100755 (executable)
index 0000000..a9e50f3
--- /dev/null
+++ b/new/_LinuxOpenBSD_Interp/pack-dev0
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+./run-BlackBox <<DATA
+DevCompiler.CompileThis HostDevPackedFiles
+
+DevElfLinker.LinkDll libBB0.so := Kernel+ Files HostFiles HostDevPackedFiles StdLoader
+DevPacker.PackThis libBB0.so := Code/Init.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/ElfLinker.ocf Dev/Code/Linker.ocf Cons/Code/Compiler.ocf ~
+
+# link instead of pack OS-specifics
+# DevElfLinker.LinkDll libBB0.so := Kernel+ Files HostFiles HostDevPackedFiles Console Dialog HostLang HostConsole Dates HostDates StdLoader
+# DevPacker.PackThis libBB0.so := Code/Init.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/Printers.ocf Code/Printing.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/ElfLinker.ocf Dev/Code/Linker.ocf Cons/Code/Compiler.ocf ~
+DATA

diff --git a/new/_Linux_/libBB.so b/new/_Linux_/libBB.so
index 45d34c390cd2b9c0e7ab9099279ce466c097e93b..444f9573f7ba4fa1a491aa44f63cb5c9f3cfd036 100644 (file)
Binary files a/new/_Linux_/libBB.so and b/new/_Linux_/libBB.so differ

diff --git a/new/_Linux_/libBB0.so b/new/_Linux_/libBB0.so
index af998b7729d54b5fc1b19df68d087ff7f78f0247..65e37c945f23cd93d3ce2aa694b6a1510ce72198 100644 (file)
Binary files a/new/_Linux_/libBB0.so and b/new/_Linux_/libBB0.so differ

diff --git a/new/_OpenBSD_/libBB.so b/new/_OpenBSD_/libBB.so
index 300bfe31104f7b37cf9b249aec5fb0b40c12773f..06f9b38f4cd4627b7292b0f4a87ebf1efa4ab72f 100644 (file)
Binary files a/new/_OpenBSD_/libBB.so and b/new/_OpenBSD_/libBB.so differ

diff --git a/new/_OpenBSD_/libBB0.so b/new/_OpenBSD_/libBB0.so
index 6782d14aeec1032fa727fc56eeaa86eb669bd283..4b923365b58f0f575d7ac44507f055a3dd9a0fc7 100644 (file)
Binary files a/new/_OpenBSD_/libBB0.so and b/new/_OpenBSD_/libBB0.so differ

diff --git a/new/build-gui b/new/build-gui
deleted file mode 100755 (executable)
index 0402ec4..0000000
--- a/new/build-gui
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-TARGET=`uname -s`
-# TARGET=Linux
-
-echo "Please wait..."
-
-./clean
-./switch-target ${TARGET} Interp
-./build
-./switch-target ${TARGET} GUI
-
-./run-dev0 <<DATA
-DevCompiler.CompileThis FormModels FormViews FormControllers FormCmds FormGen
-
-DevCompiler.CompileThis Gtk2GLib Gtk2GObject Gtk2Keysyms Gtk2Pango Gtk2Gdk Gtk2Gtk Gtk2Util
-
-# HostRegistry required by DevBrowser
-# HostTextConv must be recompiled, because it depend on HostFonts, and interp HostFonts has different fingerprint
-DevCompiler.CompileThis HostRegistry HostUtf8 HostFonts HostTextConv HostPorts StdTables HostMechanisms HostCFrames HostWindows HostClipboard HostDialog StdTabViews HostTabFrames HostCmds HostMenus StdMenuTool
-
-DevCompiler.CompileThis Config Init
-
-###
-
-DevCompiler.CompileThis DevAlienTool DevDebug DevDependencies DevHeapSpy DevInspector DevLinkChk DevMsgSpy DevRBrowser DevReferences DevSearch DevSubTool DevCmds DevBrowser
-
-DevCompiler.CompileThis ObxActions ObxAddress0 ObxAddress1 ObxAddress2 ObxAscii ObxBlackBox ObxButtons ObxCalc ObxCaps ObxContIter ObxControlShifter ObxControls ObxConv ObxCount0 ObxCount1 ObxCubes ObxDb ObxDialog ObxFact ObxFileTree ObxFldCtrls ObxGraphs ObxHello1 ObxLabelLister ObxLines ObxLinks ObxMMerge ObxOmosi ObxOpen0 ObxOpen1 ObxOrders ObxParCmd ObxPatterns ObxRatcalc ObxSample ObxScroll ObxStores ObxTabViews ObxTabs ObxTickers ObxTwins ObxUnitConv ObxViews0 ObxViews1 ObxViews10 ObxViews11 ObxViews12 ObxViews13 ObxViews14 ObxViews2 ObxViews3 ObxViews4 ObxViews5 ObxViews6 ObxWrappers
-DevCompiler.CompileThis ObxPhoneDB ObxPhoneUI ObxPhoneUI1 ObxLookup0 ObxLookup1 ObxPDBRep0 ObxPDBRep1 ObxPDBRep2 ObxPDBRep3 ObxPDBRep4
-
-# TRAP:
-#DevCompiler.CompileThis ObxCtrls
-DATA

diff --git a/new/pack-dev0 b/new/pack-dev0
deleted file mode 100755 (executable)
index 34383d9..0000000
--- a/new/pack-dev0
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-./run-BlackBox <<DATA
-# DevElfLinker.LinkDll libBB0.so := Kernel+ Files HostFiles HostPackedFiles StdLoader
-# DevPacker.PackThis libBB0.so := Code/Init.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/ElfLinker.ocf Dev/Code/Linker.ocf Cons/Code/Compiler.ocf ~
-
-# link instead of pack OS-specifics
-DevElfLinker.LinkDll libBB0.so := Kernel+ Files HostFiles HostPackedFiles Console Dialog HostLang HostConsole Dates HostDates StdLoader
-DevPacker.PackThis libBB0.so := Code/Init.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/Printers.ocf Code/Printing.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/ElfLinker.ocf Dev/Code/Linker.ocf Cons/Code/Compiler.ocf ~
-DATA