Browse Source

lindev -> dev0

Alexander Shiryaev 12 years ago
parent
commit
5f02efd568

+ 3 - 3
BlackBox/Linux/Lin/Rsrc/loader/Makefile

@@ -4,7 +4,7 @@
 # ${.ALLSRC}    $^
 # ${.IMPSRC}    $<
 
-all: lindev BlackBox
+all: dev0 BlackBox
 
 CFLAGS += -Wall -O0 -g -m32
 
@@ -14,8 +14,8 @@ CFLAGS += -Wall -O0 -g -m32
 BlackBox: BlackBox-dl.c
 	${CC} ${CFLAGS} -o $@ $^ -ldl
 
-lindev: BlackBox1.c
+dev0: BlackBox1.c
 	${CC} ${CFLAGS} -o $@ $^ -L . -lBB0
 
 clean:
-	rm -f lindev BlackBox
+	rm -f dev0 BlackBox

+ 1 - 0
BlackBox/Linux/dev0

@@ -0,0 +1 @@
+Lin/Rsrc/loader/dev0

+ 0 - 1
BlackBox/Linux/lindev

@@ -1 +0,0 @@
-Lin/Rsrc/loader/lindev

+ 3 - 3
BlackBox/OpenBSD/Lin/Rsrc/loader/Makefile

@@ -6,7 +6,7 @@
 
 CFLAGS += -Wall -O0 -g
 
-all: libdlobsdwrap.so lindev BlackBox
+all: libdlobsdwrap.so dev0 BlackBox
 
 # libdlobsdwrap.so: universal method of correct access to dl* functions
 #	in case of dynamic loading of libBB*.so "ld.so" in LibDl may be used instead of "libc.so", but not in case of static linking
@@ -20,11 +20,11 @@ all: libdlobsdwrap.so lindev BlackBox
 BlackBox: BlackBox-dl.c
 	${CC} ${CFLAGS} -o ${.TARGET} ${.ALLSRC} -pthread
 
-lindev: BlackBox1.c
+dev0: BlackBox1.c
 	${CC} ${CFLAGS} -o ${.TARGET} ${.ALLSRC} -L . -lBB0
 
 libdlobsdwrap.so: libdlobsdwrap.c
 	${CC} ${CFLAGS} -o ${.TARGET} ${.ALLSRC} -fPIC -shared
 
 clean:
-	rm -f lindev BlackBox libdlobsdwrap.so
+	rm -f dev0 BlackBox libdlobsdwrap.so

+ 1 - 0
BlackBox/OpenBSD/dev0

@@ -0,0 +1 @@
+Lin/Rsrc/loader/dev0

+ 0 - 1
BlackBox/OpenBSD/lindev

@@ -1 +0,0 @@
-Lin/Rsrc/loader/lindev

+ 1 - 1
BlackBox/build

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-./run-lindev <<DATA
+./run-dev0 <<DATA
 Dev0Compiler.Compile('Lin/Mod', 'Dl.txt')
 Dev0Compiler.Compile('Lin/Mod', 'Libc.txt')
 Dev0Compiler.Compile('System/Mod', 'Kernel.txt')

+ 1 - 1
BlackBox/build-lindev → BlackBox/build-dev0

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-./run-lindev <<DATA
+./run-dev0 <<DATA
 Dev0Compiler.Compile('Lin/Mod', 'Dl.txt')
 Dev0Compiler.Compile('Lin/Mod', 'Libc.txt')
 Dev0Compiler.Compile('System/Mod', 'Kernel.txt')

+ 4 - 0
BlackBox/run-dev0

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# env LD_LIBRARY_PATH=. env LD_DEBUG=1 ./dev0
+env LD_LIBRARY_PATH=. ./dev0

+ 0 - 4
BlackBox/run-lindev

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# env LD_LIBRARY_PATH=. env LD_DEBUG=1 ./lindev
-env LD_LIBRARY_PATH=. ./lindev

+ 4 - 4
BlackBox/switch-os

@@ -9,7 +9,7 @@ none() {
 	rm -rf \
 		System/Mod/Kernel.odc System/Mod/Kernel.txt System/Code/Kernel.ocf System/Sym/Kernel.osf \
 		Code/Kernel.ocf Sym/Kernel.osf \
-		Host Win Lin BlackBox blackbox.exe BlackBox.exe *.so lindev
+		Host Win Lin BlackBox blackbox.exe BlackBox.exe *.so dev0
 }
 
 obsd() {
@@ -20,7 +20,7 @@ obsd() {
 	ln -s OpenBSD/libBB.so
 	ln -s OpenBSD/libBB0.so
 	ln -s OpenBSD/BlackBox
-	ln -s OpenBSD/lindev
+	ln -s OpenBSD/dev0
 	ln -s OpenBSD/libdlobsdwrap.so
 }
 
@@ -31,8 +31,8 @@ lin() {
 	ln -s Linux/Host
 	ln -s Linux/libBB.so
 	ln -s Linux/libBB0.so
-	ln -s Linux/BlackBox .
-	ln -s Linux/lindev .
+	ln -s Linux/BlackBox
+	ln -s Linux/dev0
 }
 
 case $1 in

+ 1 - 1
README

@@ -13,7 +13,7 @@ How to build:
 
 	compile self:
 
-		cd BlackBox; ./switch-os `uname -s`; ./clean; ./build-lindev; ./build
+		cd BlackBox; ./switch-os `uname -s`; ./clean; ./build-dev0; ./build
 
 Files:
 	original: