X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=support%2Fscripts%2Fbuild.mak;h=664b82bdda4b3113bc87ca059d6bfa835879daf0;hb=edb1511603ffaa6c04f94b27fb8e6862e93dd19f;hp=3a01ae7e7a4c4a774776eb256ef6401059fbe2e8;hpb=646879b54a5b6a5388fdee6e8091d20e564c2568;p=fw%2Fsdcc

diff --git a/support/scripts/build.mak b/support/scripts/build.mak
index 3a01ae7e..664b82bd 100644
--- a/support/scripts/build.mak
+++ b/support/scripts/build.mak
@@ -10,6 +10,8 @@ BUILD = $(TOPDIR)/build/sdcc
 SDCCLIB = $(BUILD)
 CVSFLAGS = -z5
 CVS = cvs
+SVNFLAGS =
+SVN = svn
 DIR = .
 VER = 2.2.1
 # Used as a branch name.
@@ -24,7 +26,7 @@ COMPILE_MODE = linux-mingw32
 SDCC_OR_GBDK = sdcc
 
 ROOT_GBDK = :pserver:anonymous@cvs.gbdk.sourceforge.net:/cvsroot/gbdk
-ROOT_SDCC = :pserver:anonymous@cvs.sdcc.sourceforge.net:/cvsroot/sdcc
+ROOT_SDCC = https://svn.sourceforge.net/svnroot/sdcc
 
 ifeq ($(COMPILE_MODE),linux-linux)
 # For Linux
@@ -62,25 +64,19 @@ clean:
 	rm -rf $(BUILD) gbdk-lib gbdk-support sdcc logged_in
 
 update: logged_in
-	cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_SDCC) co -r sdcc-$(SHORTVER) sdcc
+	cd $(DIR); svn $(SVNFLAGS) co $(ROOT_SDCC)/branches/sdcc-$(SHORTVER)/sdcc sdcc
 	cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_GBDK) co -r sdcc-$(SHORTVER) gbdk-lib
 	cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_GBDK) co -r sdcc-$(SHORTVER) gbdk-support
 
 _sdcc: sdcc-bin sdcc-misc sdcc-lib sdcc-doc
 
 tidy:
-	rm -rf `find $(BUILD) -name "CVS"`
-	rm -rf `find $(BUILD)/lib -name "*.asm"`
+	find $(BUILD) -name "CVS" -exec rm -rf \;
+	find $(BUILD) -name ".svn" -exec rm -rf \;
+	find $(BUILD)/lib -name "*.asm" -exec rm -rf \;
 	-$(TNP)strip $(BUILD)/bin/*
 
 sdcc-bin: sdcc/sdccconf.h
-<<<<<<< build.mak
-	make -C sdcc sdcc-bin
-	mkdir -p $(BUILD)/bin
-	for i in \
-	sdcc sdcpp link-z80 as-z80 aslink asx8051 sdcdb; \
-	do cp sdcc/bin/$$i$(SE) $(BUILD)/bin/$$i$(E); done
-=======
 	make -C sdcc sdcc-bin CROSS_LIBGC=$(CROSS_LIBGC)
 	mkdir -p $(BUILD)/bin
 	for i in \
@@ -93,7 +89,6 @@ sdcc-misc: sdcc/sdccconf.h
 	for i in \
 	sdcdb; \
 	do cp sdcc/bin/$$i$(SE) $(BUILD)/bin/$$i$(E); done
->>>>>>> 1.1.2.5
 	cp sdcc/sim/ucsim/s51.src/s51$(E) $(BUILD)/bin
 	cp sdcc/sim/ucsim/z80.src/sz80$(E) $(BUILD)/bin
 	cp sdcc/sim/ucsim/avr.src/savr$(E) $(BUILD)/bin
@@ -121,17 +116,10 @@ sdcc-lib-z80:
 sdcc-lib-gen:
 	make -C sdcc sdcc-device
 
-<<<<<<< build.mak
-lcc:
-	make -C gbdk-support/lcc SDCCLIB=$(SDCC_ROOT)/
-	cp gbdk-support/lcc/lcc$(E) $(BUILD)/bin
-
-=======
 lcc:
 	make -C gbdk-support/lcc SDCCLIB=$(SDCC_ROOT)/ TNP=$(TNP)
 	cp gbdk-support/lcc/lcc$(SE) $(BUILD)/bin/lcc$(E)
 
->>>>>>> 1.1.2.5
 sdcc/sdccconf.h: sdcc/configure
 ifdef TNP
 	cd sdcc; \
@@ -153,7 +141,4 @@ logged_in:
 	cvs -d$(ROOT_GBDK) login
 	cvs -d$(ROOT_SDCC) login
 	touch logged_in
-<<<<<<< build.mak
-	make update=======
 	make -f build.mak update
->>>>>>> 1.1.2.5