From 8bf977fe93e31fbe88c70c05a047cf95bfb8cbb7 Mon Sep 17 00:00:00 2001 From: Peter Broadbery Date: Thu, 1 Aug 2019 21:28:14 +0100 Subject: [PATCH 1/6] test/Makefile: Remove duplicated lines (FIXUP) --- aldor/aldor/test/Makefile.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/aldor/aldor/test/Makefile.in b/aldor/aldor/test/Makefile.in index 983e1d705..421006e44 100644 --- a/aldor/aldor/test/Makefile.in +++ b/aldor/aldor/test/Makefile.in @@ -25,12 +25,6 @@ STEPS := ALDOR ALDOR_AP ALDOR_CMD ALDOR_EXE ALDOR_FM ALDOR_GENC \ $(foreach rule,$(STEPS),$(eval $(call am_auto_template,$(rule)))) -define am_auto_template -AM_V_$(1) = $$(am__v_$(1)_$$(V)) -am__v_$(1)_ = $$(am__v_$(1)_$$(AM_DEFAULT_VERBOSITY)) -am__v_$(1)_0 = @echo " $(1) " $@; -endef - all: really-all .PRECIOUS: Makefile From 8de09e18f7551dab1e85bd724b529421e97c638f Mon Sep 17 00:00:00 2001 From: Peter Broadbery Date: Thu, 1 Aug 2019 21:34:27 +0100 Subject: [PATCH 2/6] Makefiles: simplify silent rules using make functions --- aldor/aldor/test/Makefile.in | 4 +-- aldor/lib/buildlib.mk | 62 ++++++++++-------------------------- 2 files changed, 19 insertions(+), 47 deletions(-) diff --git a/aldor/aldor/test/Makefile.in b/aldor/aldor/test/Makefile.in index 421006e44..9822479cf 100644 --- a/aldor/aldor/test/Makefile.in +++ b/aldor/aldor/test/Makefile.in @@ -14,7 +14,7 @@ abs_top_srcdir = @abs_top_srcdir@ subdir = aldor/test JUNIT_JAR = @JUNIT_JAR@ -define am_auto_template +define am_silent_template AM_V_$(1) = $$(am__v_$(1)_$$(V)) am__v_$(1)_ = $$(am__v_$(1)_$$(AM_DEFAULT_VERBOSITY)) am__v_$(1)_0 = @echo " $(subst _,-,$(1)) " $$@; @@ -23,7 +23,7 @@ endef STEPS := ALDOR ALDOR_AP ALDOR_CMD ALDOR_EXE ALDOR_FM ALDOR_GENC \ ALDOR_JAVATEST ALDOR_OBJ JAVAC ALDOR_JAVA JAVA_CP JUNIT -$(foreach rule,$(STEPS),$(eval $(call am_auto_template,$(rule)))) +$(foreach rule,$(STEPS),$(eval $(call am_silent_template,$(rule)))) all: really-all diff --git a/aldor/lib/buildlib.mk b/aldor/lib/buildlib.mk index 17f0da585..0be1e2a40 100644 --- a/aldor/lib/buildlib.mk +++ b/aldor/lib/buildlib.mk @@ -19,51 +19,23 @@ libsubdir := $(subst $(abs_libdir)/,,$(abs_builddir)/.) include $(top_builddir)/lib/config.mk -# Aldor -AM_V_ALDOR = $(am__v_ALDOR_$(V)) -am__v_ALDOR_ = $(am__v_ALDOR_$(AM_DEFAULT_VERBOSITY)) -am__v_ALDOR_0 = @echo " ALDOR " $@; - -AM_V_AO2C = $(am__v_AO2C_$(V)) -am__v_AO2C_ = $(am__v_AO2C_$(AM_DEFAULT_VERBOSITY)) -am__v_AO2C_0 = @echo " AO2C " $@; - -AM_V_AO2FM = $(am__v_AO2FM_$(V)) -am__v_AO2FM_ = $(am__v_AO2FM_$(AM_DEFAULT_VERBOSITY)) -am__v_AO2FM_0 = @echo " AO2FM " $@; - -AM_V_AR = $(am__v_AR_$(V)) -am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY)) -am__v_AR_0 = @echo " AR " $@; - -AM_V_DEP = $(am__v_DEP_$(V)) -am__v_DEP_ = $(am__v_DEP_$(AM_DEFAULT_VERBOSITY)) -am__v_DEP_0 = @echo " DEP " $@; - -AM_V_FOAMJ = $(am__v_FOAMJ_$(V)) -am__v_FOAMJ_ = $(am__v_FOAMJ_$(AM_DEFAULT_VERBOSITY)) -am__v_FOAMJ_0 = @echo " FOAMJ " $@; - -AM_V_JAR = $(am__v_JAR_$(V)) -am__v_JAR_ = $(am__v_JAR_$(AM_DEFAULT_VERBOSITY)) -am__v_JAR_0 = @echo " JAR " $@; - -AM_V_JAVAC = $(am__v_JAVAC_$(V)) -am__v_JAVAC_ = $(am__v_JAVAC_$(AM_DEFAULT_VERBOSITY)) -am__v_JAVAC_0 = @echo " JAVAC " $@; - -AM_V_JAR = $(am__v_JAR_$(V)) -am__v_JAR_ = $(am__v_JAR_$(AM_DEFAULT_VERBOSITY)) -am__v_JAR = @echo " JAR " $@; - -# ALDORTEST - don't echo anything as the build rule will show the test name -AM_V_ALDORTEST = $(am__v_ALDORTEST_$(V)) -am__v_ALDORTEST_ = $(am__v_ALDORTEST_$(AM_DEFAULT_VERBOSITY)) -am__v_ALDORTEST_0 = @ - -AM_V_ALDORTESTJ = $(am__v_ALDORTESTJ_$(V)) -am__v_ALDORTESTJ_ = $(am__v_ALDORTESTJ_$(AM_DEFAULT_VERBOSITY)) -am__v_ALDORTESTJ_0 = @ +define am_silent_template +AM_V_$(1) = $$(am__v_$(1)_$$(V)) +am__v_$(1)_ = $$(am__v_$(1)_$$(AM_DEFAULT_VERBOSITY)) +am__v_$(1)_0 = @echo " $(subst _,-,$(1)) " $$@; +endef + +define am_silent_template_quiet +AM_V_$(1) = $$(am__v_$(1)_$$(V)) +am__v_$(1)_ = $$(am__v_$(1)_$$(AM_DEFAULT_VERBOSITY)) +am__v_$(1)_0 = @ +endef + +STEPS := ALDOR AO2C AO2FM AR DEP FOAMJ JAR JAR JAVAC +QUIET_STEPS := ALDORTEST ALDORTESTJ + +$(foreach rule,$(STEPS),$(eval $(call am_silent_template,$(rule)))) +$(foreach rule,$(QUIET_STEPS),$(eval $(call am_silent_template_quiet,$(rule)))) # Check the makefile From a979d0bafda1250ac6eebf3fe437278984eb45f6 Mon Sep 17 00:00:00 2001 From: Peter Broadbery Date: Thu, 1 Aug 2019 21:35:18 +0100 Subject: [PATCH 3/6] Makefiles: Don't use -Wv=2 when compiling C files .. Too verbose. --- aldor/aldor/test/Makefile.in | 3 +-- aldor/lib/buildlib.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/aldor/aldor/test/Makefile.in b/aldor/aldor/test/Makefile.in index 9822479cf..f8a6310f6 100644 --- a/aldor/aldor/test/Makefile.in +++ b/aldor/aldor/test/Makefile.in @@ -199,7 +199,7 @@ $(patsubst %, %.exe, $(_xtests)): %.exe: %.o rtexns.o -Y$(foamdir) \ -Y$(foamlibdir) \ -Lfoamlib \ - -Cargs="-Wconfig=$(aldorsrcdir)/aldor.conf -I$(aldorsrcdir) -Wv=2 $(UNICLFLAGS)" \ + -Cargs="-Wconfig=$(aldorsrcdir)/aldor.conf -I$(aldorsrcdir) $(UNICLFLAGS)" \ -Fx=$@ out/ao/$*.ao rtexns.o # -Fmain=bobthebuilder.c \ @@ -237,7 +237,6 @@ really-all: \ $(patsubst %,%.o,$(_otests)) \ $(patsubst %,%.exe,$(_xtests)) - .PHONY: all # diff --git a/aldor/lib/buildlib.mk b/aldor/lib/buildlib.mk index 0be1e2a40..79a5d0eba 100644 --- a/aldor/lib/buildlib.mk +++ b/aldor/lib/buildlib.mk @@ -250,7 +250,7 @@ $(aldortestexecs): %.aldortest.exe: Makefile %.as -Ccc=$(aldortooldir)/unicl \ -Y$(foamdir) -Y \ -Y$(foamlibdir) -l$(libraryname) $(patsubst %,-l%,$(librarydeps)) \ - -Cargs="-Wconfig=$(aldorsrcdir)/aldor.conf -I$(aldorsrcdir) -Wv=2 $(UNICLFLAGS)" \ + -Cargs="-Wconfig=$(aldorsrcdir)/aldor.conf -I$(aldorsrcdir) $(UNICLFLAGS)" \ -I$(top_srcdir)/lib/aldor/include -Y$(top_builddir)/lib/aldor/src \ -Y$(librarylibdir) -I$(libraryincdir) -fx=$@ -DALDORTEST \ $*_test.as; ) From 5b429620393800faad4c1670d228eab4e8e36cd3 Mon Sep 17 00:00:00 2001 From: Peter Broadbery Date: Thu, 1 Aug 2019 21:35:52 +0100 Subject: [PATCH 4/6] debian: Update to reflect more recent debhelpers --- debian/compat | 2 +- debian/rules | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/compat b/debian/compat index 45a4fb75d..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/rules b/debian/rules index 0233d484d..53c0b81e0 100755 --- a/debian/rules +++ b/debian/rules @@ -6,15 +6,14 @@ # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +# Comment this to turn on verbose mode. +export DH_QUIET=1 # FIXME: This breaks the Aldor B-tree based GC. #export DEB_BUILD_HARDENING=1 %: dh $@ \ - --with autotools-dev \ --sourcedirectory=aldor \ --builddirectory=build \ --parallel From ede219a538f21e15ab2b6bf7a8ddff53f8a2fdfa Mon Sep 17 00:00:00 2001 From: Peter Broadbery Date: Sun, 11 Aug 2019 10:40:26 +0100 Subject: [PATCH 5/6] debian related cleanup --- aldor/aldor/src/axlcomp.c | 12 ++++-------- aldor/aldor/src/{version.c => version.c.in} | 4 +--- aldor/aldor/src/version.h | 4 +--- aldor/configure.ac | 3 ++- aldor/m4/git.m4 | 3 +-- debian/.gitignore | 1 + debian/changelog | 4 ++++ debian/rules | 9 ++++++--- 8 files changed, 20 insertions(+), 20 deletions(-) rename aldor/aldor/src/{version.c => version.c.in} (87%) diff --git a/aldor/aldor/src/axlcomp.c b/aldor/aldor/src/axlcomp.c index 91dd46553..038ce8840 100644 --- a/aldor/aldor/src/axlcomp.c +++ b/aldor/aldor/src/axlcomp.c @@ -89,11 +89,9 @@ compCmd(int argc, char **argv) /* Display the version string in all its glory */ if (cmdHasVerboseOption(argc, argv)) { - fprintf(osStdout, "%s version %d.%d.%d", + fprintf(osStdout, "%s version %s", verName, - verMajorVersion, - verMinorVersion, - verMinorFreeze); + verVersionId); if (*verPatchLevel) fprintf(osStdout, "(%s)", verPatchLevel); fprintf(osStdout, " for %s %s\n", CONFIG, DEBUG_CONFIG); @@ -425,12 +423,10 @@ compGLoopInit(int argc, char **argv, FILE *fout, FileName *pfn, /* Helpful start-up banner ... */ fprintf(osStdout,"%s\n",comsgString(ALDOR_M_GloopBanner)); if (comsgOkRelease()) { - fprintf(osStdout, "%s: %s(%s) version %d.%d.%d", + fprintf(osStdout, "%s: %s(%s) version %s", "Release", verName, "C", /* C-language version */ - verMajorVersion, - verMinorVersion, - verMinorFreeze); + verVersionId); if (*verPatchLevel) fprintf(osStdout, "(%s)", verPatchLevel); fprintf(osStdout, " for %s %s\n", CONFIG, DEBUG_CONFIG); diff --git a/aldor/aldor/src/version.c b/aldor/aldor/src/version.c.in similarity index 87% rename from aldor/aldor/src/version.c rename to aldor/aldor/src/version.c.in index ac1f989b7..272a60943 100644 --- a/aldor/aldor/src/version.c +++ b/aldor/aldor/src/version.c.in @@ -22,7 +22,5 @@ CString verName = "Aldor"; -int verMajorVersion = 1; -int verMinorVersion = 3; -int verMinorFreeze = 0; +CString verVersionId = "@VERSION@"; CString verPatchLevel = VCSVERSION; diff --git a/aldor/aldor/src/version.h b/aldor/aldor/src/version.h index 0fee07080..2a826899c 100644 --- a/aldor/aldor/src/version.h +++ b/aldor/aldor/src/version.h @@ -14,9 +14,7 @@ * is used for the patch level. */ extern CString verName; -extern int verMajorVersion; -extern int verMinorVersion; -extern int verMinorFreeze; +extern CString verVersionId; extern CString verPatchLevel; #endif /* !_VERSION_H_ */ diff --git a/aldor/configure.ac b/aldor/configure.ac index 1166e747f..e834b9092 100644 --- a/aldor/configure.ac +++ b/aldor/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([aldor],[1.2],[aldor@xinutec.org]) +AC_INIT([aldor],[1.3.0],[aldor@xinutec.org]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([aldor/src/main.c]) AC_CONFIG_AUX_DIR([amaux]) @@ -75,6 +75,7 @@ AC_CONFIG_FILES( aldor/subcmd/testaldor/Makefile aldor/src/Makefile aldor/src/opsys_port.h + aldor/src/version.c aldor/lib/Makefile aldor/lib/libfoamlib/Makefile diff --git a/aldor/m4/git.m4 b/aldor/m4/git.m4 index cd080bf0f..0bf6092dd 100644 --- a/aldor/m4/git.m4 +++ b/aldor/m4/git.m4 @@ -10,8 +10,7 @@ AC_ARG_ENABLE([git-build-id], no) gitid=false;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-git-build-id]) ;; esac], - [if test -f $srcdir/../.git/config ; then gitid=true; else gitid=false; fi] - [if test $gitid = true; then git_build_id=1; fi]) + [if test -f $srcdir/../.git/config ; then gitid=true; else gitid=false; fi]) # Git SHA1 hash as ld build-id. AC_MSG_CHECKING([build id]) diff --git a/debian/.gitignore b/debian/.gitignore index 4efcf9661..e2d0e696e 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -2,3 +2,4 @@ /aldor.substvars /files /*.log +/.debhelper diff --git a/debian/changelog b/debian/changelog index 0872e7f33..4588bd34b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,7 @@ +aldor (1.3.0+20190802) precise; urgency=low + + * Lots of things + aldor (1.2.0+20131001) precise; urgency=low * Fixes for mutually dependent domains. diff --git a/debian/rules b/debian/rules index 53c0b81e0..47f26dc07 100755 --- a/debian/rules +++ b/debian/rules @@ -6,18 +6,21 @@ # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. -# Comment this to turn on verbose mode. +# For a silent build. export DH_QUIET=1 # FIXME: This breaks the Aldor B-tree based GC. #export DEB_BUILD_HARDENING=1 +OPTIONS_build=--enable-git-build-id=no + %: dh $@ \ --sourcedirectory=aldor \ --builddirectory=build \ - --parallel + --parallel \ + $(OPTIONS_$(@)) build: aldor/configure -aldor/configure: aldor/autogen.sh +aldor/configure: aldor/autogen.sh aldor/configure.ac cd $(dir $@) && sh autogen.sh From 36ea4e14c2ef22ee60239c9e15e0538df41bdec5 Mon Sep 17 00:00:00 2001 From: Peter Broadbery Date: Sun, 11 Aug 2019 10:41:44 +0100 Subject: [PATCH 6/6] .gitignore: Ignore intellij files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 17453710b..69d435e83 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /build /run_j /build-2 +/.idea