Pab/work branch

.gitignore

@@ -5,3 +5,4 @@
 /build
 /run_j
 /build-2
+/.idea

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);

aldor/aldor/src/version.c → 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;

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_ */

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,13 +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))))
-
-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
+$(foreach rule,$(STEPS),$(eval $(call am_silent_template,$(rule))))
 
 all: really-all
 
@@ -205,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		\
@@ -243,7 +237,6 @@ really-all: \
      $(patsubst %,%.o,$(_otests))  \
      $(patsubst %,%.exe,$(_xtests))
 
-
 .PHONY: all
 
 # 

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

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 " $@;
+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
 
-AM_V_JAR = $(am__v_JAR_$(V))
-am__v_JAR_ = $(am__v_JAR_$(AM_DEFAULT_VERBOSITY))
-am__v_JAR = @echo "  JAR " $@;
+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
 
-# 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 = @
+STEPS := ALDOR AO2C AO2FM AR DEP FOAMJ JAR JAR JAVAC
+QUIET_STEPS := ALDORTEST ALDORTESTJ
 
-AM_V_ALDORTESTJ = $(am__v_ALDORTESTJ_$(V))
-am__v_ALDORTESTJ_ = $(am__v_ALDORTESTJ_$(AM_DEFAULT_VERBOSITY))
-am__v_ALDORTESTJ_0 = @
+$(foreach rule,$(STEPS),$(eval $(call am_silent_template,$(rule))))
+$(foreach rule,$(QUIET_STEPS),$(eval $(call am_silent_template_quiet,$(rule))))
 
 # Check the makefile
 
@@ -278,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; )

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])

debian/.gitignore

@@ -2,3 +2,4 @@
 /aldor.substvars
 /files
 /*.log
+/.debhelper

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.

debian/compat

@@ -1 +1 @@
-8
+9

debian/rules

@@ -6,19 +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.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# 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 $@				\
-	  --with autotools-dev		\
 	  --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