Browse Source

Removed git from installation dependencies

Artur Efimov 7 năm trước cách đây
mục cha
commit
1bbb01ad89
2 tập tin đã thay đổi với 17 bổ sung22 xóa
  1. 9 16
      data/bin/voc/src/makefile
  2. 8 6
      src/Makefile_linux

+ 9 - 16
data/bin/voc/src/makefile

@@ -86,7 +86,6 @@ usage:
 	@echo ""
 	@echo "Targets for (re)creating and reverting bootstrap C sources:"
 	@echo "  make bootstrap       - Update bootstrap C source directories."
-	@echo "  make revertbootstrap - Use git checkout to restore bootstrap C source directories"
 
 
 
@@ -98,16 +97,16 @@ configuration: FORCE
 	@$(CC) -I src/runtime -o a.o src/tools/make/configure.c
 	@./a.o
 	@rm a.o
-	@echo BRANCH=$$(git rev-parse --abbrev-ref HEAD)>>Configuration.Make
-	@echo Branch: $$(git rev-parse --abbrev-ref HEAD).
+	@echo BRANCH=>>Configuration.Make
+	@echo Branch: .
 
 
 bootstrapconfiguration: FORCE
 	@$(CC) -I src/runtime -o a.o src/tools/make/configure.c
 	@./a.o bootstrap
 	@rm a.o
-	@echo BRANCH=$$(git rev-parse --abbrev-ref HEAD)>>Configuration.Make
-	@echo Branch: $$(git rev-parse --abbrev-ref HEAD).
+	@echo BRANCH=>>Configuration.Make
+	@echo Branch: .
 
 
 
@@ -147,17 +146,17 @@ full: configuration
 # Use latest compiler to make compiler binary from latest compiler sources
 	@make -f src/tools/make/oberon.mk -s translate MODEL=2
 	@make -f src/tools/make/oberon.mk -s assemble MODEL=2
-	@printf "\n\n--- Compiler build successfull ---\n\n"
+	@printf "\n\n--- Compiler build successful ---\n\n"
 	@make -f src/tools/make/oberon.mk -s browsercmd MODEL=2
 	@printf "\n\n--- Library build started ---\n\n"
 	@make -f src/tools/make/oberon.mk -s library MODEL=2
 	@make -f src/tools/make/oberon.mk -s library MODEL=C
-	@printf "\n\n--- Library build successfull ---\n\n"
+	@printf "\n\n--- Library build successful ---\n\n"
 	@make -f src/tools/make/oberon.mk -s sourcechanges
 	@make -f src/tools/make/oberon.mk -s makeinstalldir
-	@printf "\n\n--- Confidence tests started ---\n\n"
-	@make -f src/tools/make/oberon.mk -s confidence MODEL=2
-	@make -f src/tools/make/oberon.mk -s instructions
+#	@printf "\n\n--- Confidence tests started ---\n\n"
+#	@make -f src/tools/make/oberon.mk -s confidence MODEL=2
+#	@make -f src/tools/make/oberon.mk -s instructions
 
 
 assemble:
@@ -277,11 +276,6 @@ bootstrapunclean: bootstrapconfiguration
 
 
 
-revertbootstrap:
-	@rm -rf bootstrap/*
-	git checkout bootstrap
-
-
 
 
 # --- multi-machine multi-platform build management ---
@@ -311,7 +305,6 @@ auto: configuration
 
 # autoonce: What auto does each time a build is triggered.
 autoonce: configuration
-	git pull
 	@if make -s full; then echo \*\* Succeeded \*\*; else echo \*\* Failed \*\*;fi
 
 

+ 8 - 6
src/Makefile_linux

@@ -4,7 +4,7 @@ VOC=../data/bin/voc/bin/voc
 CC=gcc
 SDL2Opts=`sdl2-config --cflags --libs`
 
-all: voc $(PROG) install
+all: prepare voc $(PROG) install
 
 $(PROG): $(PROG).sym
 	$(CC) -fPIC -g -I ../data/bin/voc/C/include \
@@ -46,21 +46,23 @@ Graph.sym: Graph.Mod SDL2.sym
 SDL2.sym: SDL2.Mod
 	$(VOC) -OC -cesF SDL2.Mod
 
-.PHONY: clean cleanall install pack
+.PHONY: clean cleanall install pack prepare
 
 clean:
 	rm -f *.c *.h *.o *.sym term/term.o .tmp..* ../Programs/.tmp..*
 	make -C ../data/bin/voc/src clean
 
 cleanall: clean
-	rm -f ../$(PROG) ../bin/*
+	rm -f ../$(PROG) ../$(PROG).exe ../bin/*
 	make -C ../data/bin/voc/src cleanall
 
-pack: clean
-	rm -rf Makefile ../FreeOberon ../*.exe ../*.dll \
+prepare:
+	chmod +x ../data/bin/*.sh ../data/bin/voc/src/*.sh
+
+pack: clean prepare
+	rm -rf Makefile ../$(PROG) ../*.exe ../*.dll \
 		../data/bin/voc/src/*.exe
 	ln -s Makefile_linux Makefile
-	chmod +x ../data/bin/*.sh ../data/bin/voc/src/*.sh
 	$(eval TMPDIR := $(shell mktemp -d /tmp/FreeOberon_XXXXXX))
 	mkdir -p $(TMPDIR)/FreeOberon
 	cp -r ../* $(TMPDIR)/FreeOberon