From 275fb0f3da8a5f78fbe8d5b6bc8d7a11f1aca285 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 3 Jun 2019 21:32:51 -0400 Subject: [PATCH 1/6] additions for mytempacc --- Makefile_release | 3 ++- build_root/Makefile | 23 +++++++---------------- share.mk | 4 ++-- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Makefile_release b/Makefile_release index af67004..1837b97 100644 --- a/Makefile_release +++ b/Makefile_release @@ -68,7 +68,7 @@ all:: tarzvcf_release # ###### -BUILD_DIR=$(ATSDIST)-$(C3NSTRINTKND)-$(RELEASE_VERSION) +BUILD_DIR=$(ATSDIST)-$(INTKIND)-$(RELEASE_VERSION) ###### @@ -111,6 +111,7 @@ generate_config:: ; (cd $(BUILD_DIR) && sh ./autogen.sh && $(RMRF) autom4te.cach cleanup_rel_dir:: ; @echo "Cleaning up realease directory" cleanup_rel_dir:: ; $(MKBDIR) cleanall +cleanup_rel_dir:: ; $(RMRF) $(BUILD_DIR)/.git cleanup_rel_dir:: ; $(RMRF) $(BUILD_DIR)/travis-ci ###### diff --git a/build_root/Makefile b/build_root/Makefile index 9086921..92621a4 100644 --- a/build_root/Makefile +++ b/build_root/Makefile @@ -30,7 +30,7 @@ all:: bin2_tempopt all:: lib2_libatsopt # all:: bin_tempacc -# all:: bin_myatscc +all:: bin_mytempacc # all:: ccomp/atslib/lib/libatslib.a # @@ -52,9 +52,9 @@ configure ; \ # ###### # -C3NSTRINTKND=gmpknd +# C3NSTRINTKND=gmpknd # -#C3NSTRINTKND=intknd +# C3NSTRINTKND=intknd # ###### # @@ -161,16 +161,10 @@ install_files_00: install_dirs ; \ install_files_10: bin/tempacc ; \ $(INSTALL) -m755 $< $(TEMPTORYLIBHOME)/bin/tempacc && echo $< -# install_files_11: bin/myatscc ; \ -# $(INSTALL) -m755 $< $(TEMPTORYLIBHOME)/bin/myatscc && echo $< +install_files_11: bin/mytempacc ; \ + $(INSTALL) -m755 $< $(TEMPTORYLIBHOME)/bin/mytempacc && echo $< install_files_20: bin/tempopt ; \ $(INSTALL) -m755 $< $(TEMPTORYLIBHOME)/bin/tempopt && echo $< -# install_files_30: bin/tempacc_env.sh ; \ -# $(INSTALL) -m755 $< $(bindir2)/tempacc && echo $< -# install_files_31: bin/myatscc_env.sh ; \ -# $(INSTALL) -m755 $< $(bindir2)/myatscc && echo $< -# install_files_40: bin/tempopt_env.sh ; \ -# $(INSTALL) -m755 $< $(bindir2)/tempopt && echo $< install_files_50: ; \ for x in \ @@ -199,7 +193,7 @@ uninstall:: uninstall_bin uninstall:: uninstall_home # uninstall_bin:: ; $(RMF) $(bindir2)/tempacc -# uninstall_bin:: ; $(RMF) $(bindir2)/myatscc +uninstall_bin:: ; $(RMF) $(bindir2)/mytempacc uninstall_bin:: ; $(RMF) $(bindir2)/tempopt uninstall_home:: ; $(RMRF) $(TEMPTORYLIBHOME) # @@ -222,11 +216,8 @@ cleanall:: ; $(RMF) config.status cleanall:: ; $(RMRF) autom4te.cache cleanall:: ; $(RMF) bin/tempacc -# cleanall:: ; $(RMF) bin/myatscc +cleanall:: ; $(RMF) bin/mytempacc cleanall:: ; $(RMF) bin/tempopt -cleanall:: ; $(RMF) bin/tempacc_env.sh -# cleanall:: ; $(RMF) bin/myatscc_env.sh -cleanall:: ; $(RMF) bin/tempopt_env.sh cleanall:: ; $(RMF) ccomp/atslib/lib/* cleanall:: ; $(RMF) ccomp/atslib/lib64/* diff --git a/share.mk b/share.mk index b22d5e3..fa17896 100644 --- a/share.mk +++ b/share.mk @@ -23,8 +23,8 @@ RELBRANCH=tags/v$(RELEASE_VERSION) # these should be changed also # -DIR_INT=$(ATSDIST)-intknd-$(RELEASE_VERSION) -DIR_GMP=$(ATSDIST)-gmpknd-$(RELEASE_VERSION) +DIR_INT=$(ATSDIST)-int-$(RELEASE_VERSION) +DIR_GMP=$(ATSDIST)-gmp-$(RELEASE_VERSION) DIR_CLU=$(ATSDIST)-include-$(RELEASE_VERSION) ###### From 0b40a0fd93ed1fdebba3561227609ec48d680769 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 3 Jun 2019 21:45:27 -0400 Subject: [PATCH 2/6] path change for building ATS-Temptory-inlcude --- Makefile_include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile_include b/Makefile_include index 762f936..297e37e 100644 --- a/Makefile_include +++ b/Makefile_include @@ -16,8 +16,8 @@ all:: tarzvcf ###### -SRC=$(ATSDIST)-intknd-$(RELEASE_VERSION) -DST=$(ATSDIST)-include-$(RELEASE_VERSION) +SRC=$(DIR_INT) +DST=$(DIR_CLU) ###### From 66190b6c8c6cb3ad77e54ebfa6e91dee16a0982d Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 3 Jun 2019 21:55:21 -0400 Subject: [PATCH 3/6] adding mytempacc --- build_root/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build_root/Makefile b/build_root/Makefile index 92621a4..5feef84 100644 --- a/build_root/Makefile +++ b/build_root/Makefile @@ -90,6 +90,11 @@ $(MAKE) -C utils/tempacc copy build clean bin_tempacc: utl_tempacc ; \ $(MVF) utils/tempacc/BUILD/tempacc bin/tempacc +utl_mytempacc: ; \ +$(MAKE) -C utils/mytempacc copy build clean +bin_mytempacc: utl_mytempacc ; \ +$(MVF) utils/mytempacc/BUILD/mytempacc bin/mytempacc + ###### # src2_libatsopt: ; \ From a552d0b1e7d9773553941b0b85782022f47fa14d Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 3 Jun 2019 22:20:21 -0400 Subject: [PATCH 4/6] adding mytempacc --- Makefile_include | 4 ++-- build_root/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile_include b/Makefile_include index 297e37e..1cc995a 100644 --- a/Makefile_include +++ b/Makefile_include @@ -16,8 +16,8 @@ all:: tarzvcf ###### -SRC=$(DIR_INT) -DST=$(DIR_CLU) +SRC=$(ATSDIST)-int-$(RELEASE_VERSION) +DST=$(ATSDIST)-include-$(RELEASE_VERSION) ###### diff --git a/build_root/Makefile b/build_root/Makefile index 5feef84..ad46d58 100644 --- a/build_root/Makefile +++ b/build_root/Makefile @@ -88,12 +88,12 @@ bin2_tempopt: src2_tempopt ; $(CPF) srcgen/CBOOT/tempopt bin/tempopt utl_tempacc: ; \ $(MAKE) -C utils/tempacc copy build clean bin_tempacc: utl_tempacc ; \ -$(MVF) utils/tempacc/BUILD/tempacc bin/tempacc +$(CPF) utils/tempacc/BUILD/tempacc bin/tempacc utl_mytempacc: ; \ $(MAKE) -C utils/mytempacc copy build clean bin_mytempacc: utl_mytempacc ; \ -$(MVF) utils/mytempacc/BUILD/mytempacc bin/mytempacc +$(CPF) utils/mytempacc/BUILD/mytempacc bin/mytempacc ###### # From cbd4665504cf1ec9e64b541c5e4e8bf1f3ab06e9 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 3 Jun 2019 22:38:27 -0400 Subject: [PATCH 5/6] temporary removal of test --- Makefile_build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile_build b/Makefile_build index a6b6469..d1eb89a 100644 --- a/Makefile_build +++ b/Makefile_build @@ -30,12 +30,12 @@ include:: ; $(MAKE) -f $(MAKEINC) all ###### -test:: ; (cd $(DIR_INT) && ./configure) -test:: ; (cd $(DIR_GMP) && ./configure) +# test:: ; (cd $(DIR_INT) && ./configure) +# test:: ; (cd $(DIR_GMP) && ./configure) -test:: ; time $(MAKE) -C $(DIR_INT) all -test:: ; time $(MAKE) -C $(DIR_GMP) all -test:: ; time $(MAKE) -C $(DIR_CLU) all +# test:: ; time $(MAKE) -C $(DIR_INT) all +# test:: ; time $(MAKE) -C $(DIR_GMP) all +# test:: ; time $(MAKE) -C $(DIR_CLU) all ###### From f07a293dc89fb9efda262735305347b10560ab87 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 3 Jun 2019 22:46:24 -0400 Subject: [PATCH 6/6] temporary removal of test --- Makefile_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile_build b/Makefile_build index d1eb89a..faf0f8a 100644 --- a/Makefile_build +++ b/Makefile_build @@ -16,7 +16,7 @@ MAKEINC=Makefile_include all:: intkind all:: gmpkind all:: include -all:: test +# all:: test all:: clean ######