github
/
amiga-gcc
mirror of https://github.com/bebbo/amiga-gcc.git
1
0
Fork 0
Code Releases Activity

add support to switch the branch per module

This commit is contained in:
bebbo 2022-04-20 10:44:21 +02:00
parent 4766d09d9b
commit e17bea3d93
4 changed files with 114 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -6,4 +6,5 @@ Output
.lock .lock
.state .state
.vscode .vscode
.DS_Store .DS_Store
.repos*

198
Makefile
View File

@ -29,28 +29,13 @@ else
SED := sed SED := sed
endif endif
BINUTILS_BRANCH := amiga # get git urls and branches from .repos file
GCC_BRANCH := gcc-6-branch $(shell [ ! -f .repos ] && cp default-repos .repos)
NEWLIB_BRANCH := amiga modules := $(shell cat .repos | sed -e 's/[[:blank:]]\+/ /g' | cut -d' ' -f1)
get_url = $(shell grep $(1) .repos | sed -e 's/[[:blank:]]\+/ /g' | cut -d' ' -f2)
GIT_AMIGA_NETINCLUDE := https://github.com/bebbo/amiga-netinclude get_branch = $(shell grep $(1) .repos | sed -e 's/[[:blank:]]\+/ /g' | cut -d' ' -f3)
GIT_BINUTILS := https://github.com/bebbo/binutils-gdb $(foreach modu,$(modules),$(eval $(modu)_URL=$(call get_url,$(modu))))
GIT_CLIB2 := https://github.com/bebbo/clib2 $(foreach modu,$(modules),$(eval $(modu)_BRANCH=$(call get_branch,$(modu))))
GIT_FD2PRAGMA := https://github.com/bebbo/fd2pragma
GIT_FD2SFD := https://github.com/adtools/fd2sfd
GIT_GCC := https://github.com/bebbo/gcc
GIT_IRA := https://github.com/bebbo/ira
GIT_IXEMUL := https://github.com/bebbo/ixemul
GIT_LHA := https://github.com/jca02266/lha
GIT_LIBDEBUG := https://github.com/bebbo/libdebug
GIT_LIBNIX := https://github.com/bebbo/libnix
GIT_LIBSDL12 := https://github.com/AmigaPorts/libSDL12
GIT_NEWLIB_CYGWIN := https://github.com/bebbo/newlib-cygwin
GIT_SFDC := https://github.com/bebbo/sfdc
GIT_VASM := https://github.com/mheyer32/vasm
GIT_VBCC := https://github.com/bebbo/vbcc
GIT_VLINK := https://github.com/mheyer32/vlink
GIT_AROSSTUFF := https://github.com/bebbo/aros-stuff
ifeq ($(NDK),3.2) ifeq ($(NDK),3.2)
NDK_URL := http://aminet.net/dev/misc/NDK3.2R3.lha NDK_URL := http://aminet.net/dev/misc/NDK3.2R3.lha
@ -74,7 +59,7 @@ endif
CFLAGS ?= -Os CFLAGS ?= -Os
CXXFLAGS ?= $(CFLAGS) CXXFLAGS ?= $(CFLAGS)
CFLAGS_FOR_TARGET ?= CFLAGS_FOR_TARGET ?= -Os -fomit-frame-pointer
CXXFLAGS_FOR_TARGET ?= $(CFLAGS_FOR_TARGET) -fno-exceptions -fno-rtti CXXFLAGS_FOR_TARGET ?= $(CFLAGS_FOR_TARGET) -fno-exceptions -fno-rtti
E:=CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CFLAGS_FOR_BUILD="$(CFLAGS)" CXXFLAGS_FOR_BUILD="$(CXXFLAGS)" CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" CXXFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" E:=CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CFLAGS_FOR_BUILD="$(CFLAGS)" CXXFLAGS_FOR_BUILD="$(CXXFLAGS)" CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" CXXFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)"
@ -128,13 +113,6 @@ L1 = ;(
L2 = ) L2 = )
endif endif
UPDATE = __x=
ANDPULL = ;__y=$$(git branch | grep '*' | cut -b3-);echo setting remote origin from $$(git remote get-url origin) to $$__x using branch $$__y;\
git remote remove origin; \
git remote add origin $$__x; \
git remote set-branches origin $$__y;\
git pull
# ================================================= # =================================================
.PHONY: x init .PHONY: x init
@ -150,23 +128,24 @@ x:
# ================================================= # =================================================
.PHONY: help .PHONY: help
help: help:
@echo "make help display this help" @echo "make help display this help"
@echo "make info print prefix and other flags" @echo "make info print prefix and other flags"
@echo "make all build and install all" @echo "make all build and install all"
@echo "make min build and install the minimal to use gcc" @echo "make min build and install the minimal to use gcc"
@echo "make <target> builds a target: binutils, gcc, gprof, fd2sfd, fd2pragma, ira, sfdc, vasm, vbcc, vlink, libnix, ixemul, libgcc, clib2, libdebug, libSDL12, libpthread, ndk, ndk13" @echo "make <target> builds a target: binutils, gcc, gprof, fd2sfd, fd2pragma, ira, sfdc, vasm, vbcc, vlink, libnix, ixemul, libgcc, clib2, libdebug, libSDL12, libpthread, ndk, ndk13"
@echo "make clean remove the build folder" @echo "make clean remove the build folder"
@echo "make clean-<target> remove the target's build folder" @echo "make clean-<target> remove the target's build folder"
@echo "make clean-prefix remove all content from the prefix folder" @echo "make clean-prefix remove all content from the prefix folder"
@echo "make update perform git pull for all targets" @echo "make update perform git pull for all targets"
@echo "make update-<target> perform git pull for the given target" @echo "make update-<target> perform git pull for the given target"
@echo "make sdk=<sdk> install the sdk <sdk>" @echo "make sdk=<sdk> install the sdk <sdk>"
@echo "make all-sdk install all sdks" @echo "make all-sdk install all sdks"
@echo "make info display some info" @echo "make info display some info"
@echo "make l print the last log entry for each project" @echo "make l print the last log entry for each project"
@echo "make b print the branch for each project" @echo "make b print the branch for each project"
@echo "make r print the remote for each project" @echo "make r print the remote for each project"
@echo "make v date=<date> checkout all projects for a given date" @echo "make v [date=<date>] checkout all projects for a given date, checkout to branch if no date given"
@echo "make branch branch=<branch> mod=<module> switch the module to the given branch"
@echo "" @echo ""
@echo "the optional parameter THREADS=posix will build it with thread support" @echo "the optional parameter THREADS=posix will build it with thread support"
@ -392,7 +371,7 @@ $(BUILD)/binutils/Makefile: $(PROJECTS)/binutils/configure
$(PROJECTS)/binutils/configure: $(PROJECTS)/binutils/configure:
@cd $(PROJECTS) && git clone -b $(BINUTILS_BRANCH) --depth 16 $(GIT_BINUTILS) binutils @cd $(PROJECTS) && git clone -b $(binutils_BRANCH) --depth 16 $(binutils_URL) binutils
# ================================================= # =================================================
# gdb # gdb
@ -468,7 +447,7 @@ endif
$(L0)"configure gcc"$(L1) cd $(BUILD)/gcc && $(E) $(PROJECTS)/gcc/configure $(CONFIG_GCC) $(L2) $(L0)"configure gcc"$(L1) cd $(BUILD)/gcc && $(E) $(PROJECTS)/gcc/configure $(CONFIG_GCC) $(L2)
$(PROJECTS)/gcc/configure: $(PROJECTS)/gcc/configure:
@cd $(PROJECTS) && git clone -b $(GCC_BRANCH) --depth 16 $(GIT_GCC) @cd $(PROJECTS) && git clone -b $(gcc_BRANCH) --depth 16 $(gcc_URL)
# ================================================= # =================================================
# fd2sfd # fd2sfd
@ -490,7 +469,7 @@ $(BUILD)/fd2sfd/Makefile: $(PROJECTS)/fd2sfd/configure
$(L0)"configure fd2sfd"$(L1) cd $(BUILD)/fd2sfd && $(E) $(PROJECTS)/fd2sfd/configure $(CONFIG_FD2SFD) $(L2) $(L0)"configure fd2sfd"$(L1) cd $(BUILD)/fd2sfd && $(E) $(PROJECTS)/fd2sfd/configure $(CONFIG_FD2SFD) $(L2)
$(PROJECTS)/fd2sfd/configure: $(PROJECTS)/fd2sfd/configure:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_FD2SFD) @cd $(PROJECTS) && git clone -b $(fd2sfd_BRANCH) --depth 4 $(fd2sfd_URL)
for i in $$(find patches/fd2sfd/ -type f); \ for i in $$(find patches/fd2sfd/ -type f); \
do if [[ "$$i" == *.diff ]] ; \ do if [[ "$$i" == *.diff ]] ; \
then j=$${i:8}; patch -N "$(PROJECTS)/$${j%.diff}" "$$i"; fi ; done then j=$${i:8}; patch -N "$(PROJECTS)/$${j%.diff}" "$$i"; fi ; done
@ -512,7 +491,7 @@ $(BUILD)/fd2pragma/fd2pragma: $(PROJECTS)/fd2pragma/makefile $(shell find 2>/dev
$(L0)"make fd2sfd"$(L1) cd $(PROJECTS)/fd2pragma && $(CC) -o $@ $(CFLAGS) fd2pragma.c $(L2) $(L0)"make fd2sfd"$(L1) cd $(PROJECTS)/fd2pragma && $(CC) -o $@ $(CFLAGS) fd2pragma.c $(L2)
$(PROJECTS)/fd2pragma/makefile: $(PROJECTS)/fd2pragma/makefile:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_FD2PRAGMA) @cd $(PROJECTS) && git clone -b $(fd2pragma_BRANCH) --depth 4 $(fd2pragma_URL)
# ================================================= # =================================================
# ira # ira
@ -531,7 +510,7 @@ $(BUILD)/ira/ira: $(PROJECTS)/ira/Makefile $(shell find 2>/dev/null $(PROJECTS)/
$(L0)"make ira"$(L1) cd $(PROJECTS)/ira && $(CC) -o $@ $(CFLAGS) *.c -std=c99 $(L2) $(L0)"make ira"$(L1) cd $(PROJECTS)/ira && $(CC) -o $@ $(CFLAGS) *.c -std=c99 $(L2)
$(PROJECTS)/ira/Makefile: $(PROJECTS)/ira/Makefile:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_IRA) @cd $(PROJECTS) && git clone -b $(ira_BRANCH) --depth 4 $(ira_URL)
# ================================================= # =================================================
# sfdc # sfdc
@ -553,10 +532,7 @@ $(BUILD)/sfdc/Makefile: $(PROJECTS)/sfdc/configure $(shell find 2>/dev/null $(PR
$(L0)"configure sfdc"$(L1) cd $(BUILD)/sfdc && $(E) $(BUILD)/sfdc/configure $(CONFIG_SFDC) $(L2) $(L0)"configure sfdc"$(L1) cd $(BUILD)/sfdc && $(E) $(BUILD)/sfdc/configure $(CONFIG_SFDC) $(L2)
$(PROJECTS)/sfdc/configure: $(PROJECTS)/sfdc/configure:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_SFDC) @cd $(PROJECTS) && git clone -b $(sfdc_BRANCH) --depth 4 $(sfdc_URL)
for i in $$(find patches/sfdc/ -type f); \
do if [[ "$$i" == *.diff ]] ; \
then j=$${i:8}; patch -N "$(PROJECTS)/$${j%.diff}" "$$i"; retCode=$$?; [[ $$retCode -gt 1 ]] && exit $$retCode; fi ; done; exit 0
# ================================================= # =================================================
# vasm # vasm
@ -578,7 +554,7 @@ $(BUILD)/vasm/Makefile: $(PROJECTS)/vasm/Makefile $(shell find 2>/dev/null $(PRO
@touch $(BUILD)/vasm/Makefile @touch $(BUILD)/vasm/Makefile
$(PROJECTS)/vasm/Makefile: $(PROJECTS)/vasm/Makefile:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_VASM) @cd $(PROJECTS) && git clone -b $(vasm_BRANCH) --depth 4 $(vasm_URL)
# ================================================= # =================================================
# vbcc # vbcc
@ -604,7 +580,7 @@ $(BUILD)/vbcc/Makefile: $(PROJECTS)/vbcc/Makefile $(shell find 2>/dev/null $(PRO
@touch $(BUILD)/vbcc/Makefile @touch $(BUILD)/vbcc/Makefile
$(PROJECTS)/vbcc/Makefile: $(PROJECTS)/vbcc/Makefile:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_VBCC) @cd $(PROJECTS) && git clone -b $(vbcc_BRANCH) --depth 4 $(vbcc_URL)
# ================================================= # =================================================
# vlink # vlink
@ -624,7 +600,7 @@ $(BUILD)/vlink/Makefile: $(PROJECTS)/vlink/Makefile
@rsync -a $(PROJECTS)/vlink $(BUILD)/ --exclude .git @rsync -a $(PROJECTS)/vlink $(BUILD)/ --exclude .git
$(PROJECTS)/vlink/Makefile: $(PROJECTS)/vlink/Makefile:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_VLINK) @cd $(PROJECTS) && git clone -b $(vlink_BRANCH) --depth 4 $(vlink_URL)
.PHONY: lha .PHONY: lha
lha: $(BUILD)/_lha_done lha: $(BUILD)/_lha_done
@ -632,7 +608,7 @@ lha: $(BUILD)/_lha_done
$(BUILD)/_lha_done: $(BUILD)/_lha_done:
@if [ ! -e "$$(which lha 2>/dev/null)" ]; then \ @if [ ! -e "$$(which lha 2>/dev/null)" ]; then \
cd $(BUILD) && rm -rf lha; \ cd $(BUILD) && rm -rf lha; \
$(L00)"clone lha"$(L1) git clone $(GIT_LHA); $(L2); \ $(L00)"clone lha"$(L1) git clone -b $(lha_BRANCH) $(lha_URL); $(L2); \
cd lha; \ cd lha; \
$(L00)"configure lha"$(L1) aclocal; autoheader; automake -a; autoconf; ./configure; $(L2); \ $(L00)"configure lha"$(L1) aclocal; autoheader; automake -a; autoconf; ./configure; $(L2); \
$(L00)"make lha"$(L1) make all; $(L2); \ $(L00)"make lha"$(L1) make all; $(L2); \
@ -794,7 +770,7 @@ $(BUILD)/_netinclude: $(PROJECTS)/amiga-netinclude/README.md $(BUILD)/ndk-includ
@echo "done" >$@ @echo "done" >$@
$(PROJECTS)/amiga-netinclude/README.md: $(PROJECTS)/amiga-netinclude/README.md:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_AMIGA_NETINCLUDE) @cd $(PROJECTS) && git clone -b $(amiga-netinclude_BRANCH) --depth 4 $(amiga-netinclude_URL)
# ================================================= # =================================================
# libamiga # libamiga
@ -827,7 +803,7 @@ $(BUILD)/libnix/_done: $(BUILD)/newlib/_done $(BUILD)/ndk-include_ndk $(BUILD)/n
@echo "done" >$@ @echo "done" >$@
$(PROJECTS)/libnix/Makefile.gcc6: $(PROJECTS)/libnix/Makefile.gcc6:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_LIBNIX) @cd $(PROJECTS) && git clone -b $(libnix_BRANCH) --depth 4 $(libnix_URL)
# ================================================= # =================================================
# gcc libs # gcc libs
@ -859,7 +835,7 @@ $(BUILD)/clib2/_done: $(PROJECTS)/clib2/LICENSE $(shell find 2>/dev/null $(PROJE
@echo "done" >$@ @echo "done" >$@
$(PROJECTS)/clib2/LICENSE: $(PROJECTS)/clib2/LICENSE:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_CLIB2) @cd $(PROJECTS) && git clone -b $(clib2_BRANCH) --depth 4 $(clib2_URL)
# ================================================= # =================================================
# libdebug # libdebug
@ -878,7 +854,7 @@ $(BUILD)/libdebug/Makefile: $(BUILD)/libnix/_done $(PROJECTS)/libdebug/configure
$(L0)"configure libdebug"$(L1) cd $(BUILD)/libdebug && LD=m68k-amigaos-ld CC=m68k-amigaos-gcc CFLAGS="$(CFLAGS_FOR_TARGET)" $(PROJECTS)/libdebug/configure $(CONFIG_LIBDEBUG) $(L2) $(L0)"configure libdebug"$(L1) cd $(BUILD)/libdebug && LD=m68k-amigaos-ld CC=m68k-amigaos-gcc CFLAGS="$(CFLAGS_FOR_TARGET)" $(PROJECTS)/libdebug/configure $(CONFIG_LIBDEBUG) $(L2)
$(PROJECTS)/libdebug/configure: $(PROJECTS)/libdebug/configure:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_LIBDEBUG) @cd $(PROJECTS) && git clone -b $(libdebug_BRANCH) --depth 4 $(libdebug_URL)
@touch -t 0001010000 $(PROJECTS)/libdebug/configure.ac @touch -t 0001010000 $(PROJECTS)/libdebug/configure.ac
# ================================================= # =================================================
@ -906,7 +882,7 @@ $(BUILD)/libSDL12/Makefile: $(BUILD)/libnix/_done $(PROJECTS)/libSDL12/Makefile
@touch $(BUILD)/libSDL12/Makefile @touch $(BUILD)/libSDL12/Makefile
$(PROJECTS)/libSDL12/Makefile: $(PROJECTS)/libSDL12/Makefile:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_LIBSDL12) @cd $(PROJECTS) && git clone -b $(libSDL12_BRANCH) --depth 4 $(libSDL12_URL)
# ================================================= # =================================================
@ -927,7 +903,7 @@ $(BUILD)/libpthread/Makefile: $(BUILD)/libnix/_done $(PROJECTS)/aros-stuff/pthre
@touch $(BUILD)/libpthread/Makefile @touch $(BUILD)/libpthread/Makefile
$(PROJECTS)/aros-stuff/pthreads/Makefile: $(PROJECTS)/aros-stuff/pthreads/Makefile:
@cd $(PROJECTS) && git clone -b master --depth 4 $(GIT_AROSSTUFF) @cd $(PROJECTS) && git clone -b $(aros-stuff_BRANCH) --depth 4 $(aros-stuff_URL)
# ================================================= # =================================================
# newlib # newlib
@ -956,13 +932,13 @@ $(BUILD)/newlib/newlib/Makefile: $(PROJECTS)/newlib-cygwin/newlib/configure $(BU
; else touch "$(BUILD)/newlib/newlib/Makefile"; fi ; else touch "$(BUILD)/newlib/newlib/Makefile"; fi
$(PROJECTS)/newlib-cygwin/newlib/configure: $(PROJECTS)/newlib-cygwin/newlib/configure:
@cd $(PROJECTS) && git clone -b $(NEWLIB_BRANCH) --depth 4 $(GIT_NEWLIB_CYGWIN) @cd $(PROJECTS) && git clone -b $(newlib-cygwin_BRANCH) --depth 4 $(newlib-cygwin_URL)
# ================================================= # =================================================
# ixemul # ixemul
# ================================================= # =================================================
$(PROJECTS)/ixemul/configure: $(PROJECTS)/ixemul/configure:
@cd $(PROJECTS) && git clone $(GIT_IXEMUL) @cd $(PROJECTS) && git clone -b $(ixemul_BRANCH) $(ixemul_URL)
# ================================================= # =================================================
# sdk installation # sdk installation
@ -984,24 +960,22 @@ $(SDKS): libnix
# ================================================= # =================================================
.PHONY: update-repos .PHONY: update-repos
update-repos: update-repos:
@cd $(PROJECTS)/amiga-netinclude && $(UPDATE)$(GIT_AMIGA_NETINCLUDE)$(ANDPULL) @for i in $(modules); do \
@cd $(PROJECTS)/binutils && $(UPDATE)$(GIT_BINUTILS)$(ANDPULL) url=$$(grep $$i .repos | sed -e 's/[[:blank:]]\+/ /g' | cut -d' ' -f2); \
@cd $(PROJECTS)/clib2 && $(UPDATE)$(GIT_CLIB2)$(ANDPULL) bra=$$(grep $$i .repos | sed -e 's/[[:blank:]]\+/ /g' | cut -d' ' -f3); \
@cd $(PROJECTS)/fd2pragma && $(UPDATE)$(GIT_FD2PRAGMA)$(ANDPULL) bra=$${bra/$$'\n'} ;\
@cd $(PROJECTS)/fd2sfd && $(UPDATE)$(GIT_FD2SFD)$(ANDPULL) bra=$${bra/$$'\r'} ;\
@cd $(PROJECTS)/gcc && $(UPDATE)$(GIT_GCC)$(ANDPULL) if [ -e projects/$$i ]; then \
@cd $(PROJECTS)/ira && $(UPDATE)$(GIT_IRA)$(ANDPULL) pushd projects/$$i; \
@cd $(PROJECTS)/ixemul && $(UPDATE)$(GIT_IXEMUL)$(ANDPULL) echo setting remote origin from $$(git remote get-url origin) to $$url using branch $$bra.; \
# @cd $(PROJECTS)/lha && $(UPDATE)$(GIT_LHA)$(ANDPULL) git remote remove origin; \
@cd $(PROJECTS)/libdebug && $(UPDATE)$(GIT_LIBDEBUG)$(ANDPULL) git remote add origin $$url; \
@cd $(PROJECTS)/libnix && $(UPDATE)$(GIT_LIBNIX)$(ANDPULL) git remote set-branches origin $$bra; \
@cd $(PROJECTS)/libSDL12 && $(UPDATE)$(GIT_LIBSDL12)$(ANDPULL) git pull --depth 4; \
@cd $(PROJECTS)/newlib-cygwin && $(UPDATE)$(GIT_NEWLIB_CYGWIN)$(ANDPULL) git checkout $$bra; \
@cd $(PROJECTS)/sfdc && $(UPDATE)$(GIT_SFDC)$(ANDPULL) popd; \
@cd $(PROJECTS)/vasm && $(UPDATE)$(GIT_VASM)$(ANDPULL) fi; \
@cd $(PROJECTS)/vbcc && $(UPDATE)$(GIT_VBCC)$(ANDPULL) done
@cd $(PROJECTS)/vlink && $(UPDATE)$(GIT_VLINK)$(ANDPULL)
# ================================================= # =================================================
# run gcc torture check # run gcc torture check
@ -1019,7 +993,7 @@ check:
# ================================================= # =================================================
# info # info
# ================================================= # =================================================
.PHONY: info v r b l .PHONY: info v r b l branch
info: info:
@echo $@ $(UNAME_S) @echo $@ $(UNAME_S)
@echo PREFIX=$(PREFIX) @echo PREFIX=$(PREFIX)
@ -1030,11 +1004,12 @@ info:
@$(CXX) -v -E - </dev/null |& grep " version " @$(CXX) -v -E - </dev/null |& grep " version "
@echo $(BUILD) @echo $(BUILD)
@echo $(PROJECTS) @echo $(PROJECTS)
@echo MODULES = $(modules)
# print the latest git log entry for all projects # print the latest git log entry for all projects
l: l:
@for i in $(PROJECTS)/* ; do pushd . >/dev/null; cd $$i 2>/dev/null && ([[ -d ".git" ]] && echo $$i && git log -n1 --pretty=oneline); popd >/dev/null; done @for i in $(PROJECTS)/* ; do pushd . >/dev/null; cd $$i 2>/dev/null && ([[ -d ".git" ]] && echo $$i && git log -n1 --pretty=format:'%C(yellow)%h %Cred%ad %Cblue%an%Cgreen%d %Creset%s' --date=short); popd >/dev/null; done
@echo "." && git log -n1 --pretty=oneline @echo "." && git log -n1 --pretty=format:'%C(yellow)%h %Cred%ad %Cblue%an%Cgreen%d %Creset%s' --date=short
# print the git remotes for all projects # print the git remotes for all projects
r: r:
@ -1050,23 +1025,38 @@ b:
# checkout for a given date # checkout for a given date
v: v:
@D="$(date)"; \ @D="$(date)"; \
pushd projects >/dev/null; \ for i in $(modules); do \
for i in * ; do \ bra=$$(grep $$i .repos | sed -e 's/[[:blank:]]\+/ /g' | cut -d' ' -f3); \
pushd . >/dev/null; \ bra=$${bra/$$'\n'} ;\
cd $$i 2>/dev/null; \ bra=$${bra/$$'\r'} ;\
if [ -d ".git" ]; then \ if [ -e projects/$$i ]; then \
echo $$i;\ pushd projects/$$i >/dev/null; \
B=master;\ echo $$i;\
if [ "$$i" == "binutils" ] || [ "$$i" == "newlib-cygwin" ]; then B=amiga; fi;\ git checkout $$bra; \
if [ "$$i" == "gcc" ]; then B="gcc-6-branch"; fi;\ if [ "$$D" != "" ]; then \
git checkout $$B; \ (export DEPTH=16; while [ "" == "$$( git rev-list -n 1 --first-parent --before="$$D" $$bra)" ]; \
if [ "$$D" != "" ]; then git checkout `git rev-list -n 1 --first-parent --before="$$D" $$B`; fi;\ do echo "trying depth=$$DEPTH"; git pull --depth $$DEPTH ; export DEPTH=$$(($$DEPTH+$$DEPTH)); done); \
fi;\ git checkout `git rev-list -n 1 --first-parent --before="$$D" $$bra`; \
popd >/dev/null; \ fi;\
popd >/dev/null; \
fi;\
done; \ done; \
popd >/dev/null; \
echo .; \ echo .; \
B=master; \
git checkout $$B; \ git checkout $$B; \
if [ "$$D" != "" ]; then \ if [ "$$D" != "" ]; then \
git checkout `git rev-list -n 1 --first-parent --before="$$D" $$B`; \ git checkout `git rev-list -n 1 --first-parent --before="$$D" $$B`; \
fi
# change version to the given branch
branch:
@if [ "" != "$(branch)" ] && [ "1" == "$$(grep -c $(mod) .repos)" ]; then \
echo $(mod) $(branch) ; \
url=$$(grep $(mod) .repos | sed -e 's/[[:blank:]]\+/ /g' | cut -d' ' -f2); \
mv .repos .repos.bak; \
grep -v $(mod) .repos.bak > .repos; \
echo "$(mod) $$url $(branch)" >> .repos; \
$(MAKE) update-repos; \
else \
echo "$(mod) $(branch) does NOT exist!"; \
fi fi

18
default-repos Normal file
View File

@ -0,0 +1,18 @@
amiga-netinclude https://github.com/bebbo/amiga-netinclude master
binutils https://github.com/bebbo/binutils-gdb amiga
clib2 https://github.com/bebbo/clib2 master
fd2pragma https://github.com/bebbo/fd2pragma master
fd2sfd https://github.com/adtools/fd2sfd master
gcc https://github.com/bebbo/gcc gcc-6-branch
ira https://github.com/bebbo/ira master
ixemul https://github.com/bebbo/ixemul master
lha https://github.com/jca02266/lha master
libdebug https://github.com/bebbo/libdebug master
libnix https://github.com/bebbo/libnix master
libSDL12 https://github.com/AmigaPorts/libSDL12 master
newlib-cygwin https://github.com/bebbo/newlib-cygwin amiga
sfdc https://github.com/bebbo/sfdc master
vasm https://github.com/mheyer32/vasm master
vbcc https://github.com/bebbo/vbcc master
vlink https://github.com/mheyer32/vlink master
aros-stuff https://github.com/bebbo/aros-stuff master

12
patches/sfdc/sfdc.diff
View File

@ -1,12 +0,0 @@
--- sfdc/sfdc 2018-06-28 14:37:26.434918400 +0100
+++ sfdc-patched/sfdc 2018-06-28 14:42:58.370540300 +0100
@@ -484,7 +484,8 @@
while (my $line = <SFD>) {
++$line_no;
-
+ $line =~ s/\r//g;
+
for ($line) {
/==copyright\s/ && do {
( $$result{'copyright'} = $_ ) =~ s/==copyright\s+(.*)\s*/$1/;