Merge pull request #7 from sparverius/add_mytempacc

Add mytempacc
sparverius · Jun 4, 2019 · ff91cc1 · ff91cc1
2 parents 8c43e61 + f07a293
commit ff91cc1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 27 deletions.
diff --git 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
 
 ######
@@ -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
 
 ######
 

diff --git a/Makefile_include b/Makefile_include
@@ -16,7 +16,7 @@ all:: tarzvcf
 
 ######
 
-SRC=$(ATSDIST)-intknd-$(RELEASE_VERSION)
+SRC=$(ATSDIST)-int-$(RELEASE_VERSION)
 DST=$(ATSDIST)-include-$(RELEASE_VERSION)
 
 ######

diff --git 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
@@ -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
 #
 ######
 #
@@ -88,7 +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 ; \
+$(CPF) utils/mytempacc/BUILD/mytempacc bin/mytempacc
 
 ######
 #
@@ -161,16 +166,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 +198,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 +221,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
@@ -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)
 
 ######
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ all:: tarzvcf @@
     ######
-    SRC=$(ATSDIST)-intknd-$(RELEASE_VERSION)
+    SRC=$(ATSDIST)-int-$(RELEASE_VERSION)
     DST=$(ATSDIST)-include-$(RELEASE_VERSION)
     ######
@@ Expand Down @@