瀏覽代碼

merge interp folders to basic host folders

Ivan Denisov 3 年之前
父節點
當前提交
d80a0a0e1a

二進制
BlackBox/Linint/Mod/Dialog.odc → BlackBox/Lin/Mod/IntDialog.odc


二進制
BlackBox/Linint/Mod/Init.odc → BlackBox/Lin/Mod/IntInit.odc


二進制
BlackBox/Linint/Mod/Loader.odc → BlackBox/Lin/Mod/IntLoader.odc


二進制
BlackBox/Winint/Mod/Dialog.odc → BlackBox/Win/Mod/IntDialog.odc


二進制
BlackBox/Winint/Mod/Init.odc → BlackBox/Win/Mod/IntInit.odc


二進制
BlackBox/Winint/Mod/Loader.odc → BlackBox/Win/Mod/IntLoader.odc


+ 22 - 0
BlackBox/build-linux

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+echo "\ncompiling\n"
+
+./run-dev0 <<DATA
+DevCompiler.CompileSubs Lin System Std Cons Text Form Dev Dev2 Tyler
+Kernel.Quit(0)
+DATA
+
+echo "\nlinking gui\n"
+
+./run-dev0 <<DATA
+Dev2Linker1.LinkElfExe Linux blackbox := Unicode Kernel$+ Files Utf LinEnv LinFiles LinGui StdLoader LinLoader
+Kernel.Quit(0)
+DATA
+
+echo "\nlinking interp\n"
+
+./run-dev0 <<DATA
+Dev2Linker1.LinkElfExe Linux blackboxInterp := Unicode Kernel$+ Files Utf LinEnv LinFiles StdLoader LinIntLoader
+Kernel.Quit(0)
+DATA

+ 0 - 19
BlackBox/build-linux-gui

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

+ 0 - 20
BlackBox/build-linux-interp

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

+ 8 - 5
BlackBox/build-windows-gui → BlackBox/build-windows

@@ -1,9 +1,5 @@
 #!/bin/sh
 
-echo "cleaning"
-
-./clean
-
 echo "compiling"
 
 ./run-dev0 <<DATA
@@ -11,9 +7,16 @@ DevCompiler.CompileSubs Com Comm Ctl Dev Form Ole Sql Std System Text Win Cons
 Kernel.Quit(0)
 DATA
 
-echo "linking"
+echo "\nlinking gui\n"
 
 ./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
+
+echo "\nlinking interp\n"
+
+./run-dev0 <<DATA
+DevLinker.Link BBInt.exe := Unicode Kernel$+ Files Utf WinKernel WinEnv WinFiles StdLoader WinIntLoader
+Kernel.Quit(0)
+DATA

+ 0 - 19
BlackBox/build-windows-interp

@@ -1,19 +0,0 @@
-#!/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

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

@@ -1,6 +0,0 @@
-@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

+ 1 - 0
BlackBox/build-windows-gui.bat → BlackBox/build-windows.bat

@@ -1,6 +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 := Unicode Kernel$+ Files Utf WinKernel WinEnv WinFiles StdLoader WinIntLoader >> tmp.txt
 @echo Kernel.Quit(0) >> tmp.txt
 dev0win.exe /BB_PACKED_FIRST < tmp.txt
 del tmp.txt

+ 1 - 1
BlackBox/clean

@@ -4,4 +4,4 @@ find . -type f -name "*.osf" -exec rm -f {} \;
 find . -type f -name "*~" -exec rm -f {} \;
 find . -type f -name "odc?????" -exec rm -f {} \;
 find . -depth -type d -empty -exec rmdir {} \;
-rm blackbox BlackBox.exe
+rm blackbox BlackBox.exe bbint BBInt.exe 2> /dev/null

+ 11 - 60
README.md

@@ -1,11 +1,11 @@
 BlackBox Component Builder for Windows, GNU/Linux, OpenBSD, FreeBSD
 
 Tested on:
-* Windows XP, 7, 10
+* Windows XP, 7, 10, 11
 * OpenBSD 6.6
 * Fedora Core 17
-* Ubuntu 16.04 LTS, 18.04 LTS
-* Debian 9.3, 9.4 Xfce/Mate/GNOME/Cinnamon
+* Ubuntu 16.04/18.04/20.04 LTS
+* Debian 9.3, 9.4, 10.4 Xfce/Mate/GNOME/Cinnamon
 * Linux Mint 19.1/19.2/19.3/20 Cinnamon
 * CentOS 8
 * Arch Linux 4.9.6, Manjaro Linux 18.0.4
@@ -15,27 +15,6 @@ Tested on:
 
 Download: https://blackbox.oberon.org/download
 
-Directories structure:
-
-	BlackBox/
-		universal development environment for Component Pascal programming language
-	BlackBox/_*
-		platform-specific files
-
-	dev/
-		files for continuous integration system & technical notes for framework developers
-
-	examples/
-		append/  - append string to .odc file
-		encoder/ - encoding subsystems by StdCoder from the command line
-		server/  - static web-server
-
-Prepare BlackBox from repository on Windows:
-
-	copy _Windows_, _Windows_GUI and __GUI content to the BlackBox directory
-	remove other directories starting with "_"
-	run build.bat
-
 
 Installation of required packages in Debian-based systems:
 
@@ -43,7 +22,7 @@ Installation of required packages in Debian-based systems:
 
 		apt-get install i586-libgtk+2-devel.32bit
 
-	Ubuntu 18.04 LTS Bionic Beaver / Linux Mint 19.X:
+	Ubuntu 18/20 LTS, Linux Mint 19/20:
 
 		sudo dpkg --add-architecture i386
 		sudo apt update
@@ -51,68 +30,40 @@ Installation of required packages in Debian-based systems:
 
 	Linux Mint 20 has no package 'gnome-themes-extra:i386', it can be safly ignored. There will be warning in console.
 
-	Debian 9.X GNOME/Xfce/KDE
+	Debian 9.X/10.X GNOME/Xfce/KDE
 
 		sudo dpkg --add-architecture i386
 		sudo apt update
 		sudo apt install libgtk2.0-0:i386 gtk2-engines:i386 gtk2-engines-murrine:i386 libcanberra-gtk-module:i386 gtk2-engines-pixbuf:i386 libatk-adaptor:i386 libgail-common:i386 gnome-themes-standard:i386
 
-	Ubuntu 16.04 LTS i386:
-
-		sudo apt-get install libgtk2.0-0 gtk2-engines gtk2-engines-murrine libcanberra-gtk-module gnome-icon-theme-full
-
-	Ubuntu 16.04 LTS amd64:
-
-		sudo dpkg --add-architecture i386
-		sudo apt-get update
-		sudo apt-get install libgtk2.0-0:i386 gtk2-engines:i386 gtk2-engines-murrine:i386 libcanberra-gtk-module:i386 gnome-icon-theme-full
-
-
 	Arch-based systems amd64:
 
 		sudo pacman -S multilib/lib32-gtk2
 
-In OpenBSD use 'wxallowed' flag in mount options for the partition to start BlackBox from.
-
+	In OpenBSD use 'wxallowed' flag in mount options for the partition to start BlackBox from.
 
 
 To build BlackBox:
 
-	cd BlackBox
-	./switch-target `uname -s` GUI
 	./build
 
-To run BlackBox (after build):
-
-	./run-BlackBox
-
-for Linux version also you can run
+To run GUI:
 
 	./blackbox
 
-To create BlackBox framework assembly (after build):
+To run GUI in Ubuntu:
 
-	./export <outputDirectory>
+	./run-BlackBox
 
-To clean the BlackBox folder:
+To clean reopsitory:
 
-	./switch-target none
 	./clean
 
-Example: build, create framework assembly and run BlackBox from it:
-
-	cd BlackBox
-	./switch-target `uname -s` GUI
-	./build
-	./export ../`uname -s`_GUI
-	./switch-target none
-	./clean
-	cd ../`uname -s`_GUI
-	./run-BlackBox
 
 Authors:
 * Oberon microsystems AG
 * BlackBox Framework Center
+* OberonCore
 * Alexander V. Shiryaev
 * Igor A. Dehtyarenko
 * Ivan A. Denisov