AISC_COM/AISC/export2sub

+# -*-Mode: Makefile;-*-
+#
+# --------------------------------------------------------------------------------
+# variables listed here are automatically exported to sub-makefiles
+# documentation for single variables can be found in ../../SOURCE_TOOLS/parent_make.txt
+
+export AISC_SAVE
+export AUTODEPENDS
+export CLIENTCOMPILER
+export COMPILER
+export LINK_STATIC_LIB
+export MAIN_SOURCE
+export PRIVATE_SERVER_OBJECTS
+export POST_COMPILE
+
+

SOURCE_TOOLS/mv_if_diff

+#!/bin/bash
+
+if [ -z "$2" ] ; then
+    echo "Usage: mv_if_diff source target"
+    echo "Moves source to target."
+    echo "If target does not differ from source, target is kept untouched."
+    echo "If target does not exist, source is always moved to target."
+    echo "source always gets removed."
+    exit 1
+fi
+    
+if [ -f "$2" ]; then    
+    DIFF=`diff $1 $2 | wc -l`
+    if [ $DIFF = 0 ] ; then
+        echo "$2 did not change."
+        rm $1
+    else
+        echo "$2 updated."
+        mv $1 $2
+    fi
+else
+    echo "$2 created."
+    mv $1 $2
+fi

SOURCE_TOOLS/version_info

+CANDIDATE=3
+MAJOR=6
+MINOR=0
+PATCHLEVEL=6
+last_upgrade=1471855920

debian/copyright

@@ -3,7 +3,15 @@ Upstream-Name: Arb
 Upstream-Contact: Arb development team <devel@arb-home.de>,
                   Ralf Westram <ralf@arb-home.de>
 Source: http://download.arb-home.de/release/
-Files-Excluded: arbsrc*/AISC*
+Files-Excluded: arbsrc*/AISC/aisc*
+                arbsrc*/AISC/Makefile
+                arbsrc*/AISC_COM/C
+                arbsrc*/AISC_COM/Makefile
+                arbsrc*/AISC_COM/AISC/Makefile
+                arbsrc*/AISC_COM/AISC/aisc*
+                arbsrc*/AISC_COM/AISC/keys.README
+                arbsrc*/AISC_COM/AISC/magic.lst
+                arbsrc*/AISC_MKPTPS
                 arbsrc*/ARB_GDE
                 arbsrc*/AW*
                 arbsrc*/BINDEP
@@ -52,13 +60,13 @@ Files-Excluded: arbsrc*/AISC*
                 arbsrc*/SOURCE_TOOLS/f*
                 arbsrc*/SOURCE_TOOLS/gen_dep.pl
                 arbsrc*/SOURCE_TOOLS/grepx.pl
-                arbsrc*/SOURCE_TOOLS/m*
+                arbsrc*/SOURCE_TOOLS/make_java_dependencies.sh
                 arbsrc*/SOURCE_TOOLS/n*
                 arbsrc*/SOURCE_TOOLS/p*
                 arbsrc*/SOURCE_TOOLS/r*
                 arbsrc*/SOURCE_TOOLS/s*
                 arbsrc*/SOURCE_TOOLS/t*
-                arbsrc*/SOURCE_TOOLS/v*
+                arbsrc*/SOURCE_TOOLS/valgrind2grep
                 arbsrc*/ST*
                 arbsrc*/TEMPLATES/C*
                 arbsrc*/TEMPLATES/arb_debug.h

debian/patches/fix_main_makefile.patch

@@ -134,3 +134,12 @@
  	$(MAKE) "WITHPERL=1" perl arb_no_perl
  
  motif_xpm_hack:
+@@ -2312,7 +2263,7 @@ post_commit_check:
+ # --------------------------------------------------------------------------------
+ 
+ build: arb
+-	$(MAKE) binlink preplib compile_compatibility
++	$(MAKE) preplib compile_compatibility
+ 
+ all:
+ 	@echo "Build time" > $(TIMELOG)

debian/patches/ignore_unneeded_stuff.patch

+--- a/SOURCE_TOOLS/generate_all_links.sh
++++ b/SOURCE_TOOLS/generate_all_links.sh
+@@ -146,64 +146,11 @@ symlink_maybe_no_target GENH/aisc.h
+ 
+ # TEMPLATES directory
+ 
+-symlink_file ../TEMPLATES/arb_algo.h INCLUDE/arb_algo.h &&
+-symlink_file ../TEMPLATES/arb_backtrace.h INCLUDE/arb_backtrace.h &&
+-symlink_file ../TEMPLATES/arb_debug.h INCLUDE/arb_debug.h &&
+-symlink_file ../TEMPLATES/arb_defs.h INCLUDE/arb_defs.h &&
+-symlink_file ../TEMPLATES/arb_early_check.h INCLUDE/arb_early_check.h &&
+-symlink_file ../TEMPLATES/arb_error.h INCLUDE/arb_error.h &&
+-symlink_file ../TEMPLATES/arb_forward_list.h INCLUDE/arb_forward_list.h &&
+-symlink_file ../TEMPLATES/arb_global_defs.h INCLUDE/arb_global_defs.h &&
+-symlink_file ../TEMPLATES/arb_simple_assert.h INCLUDE/arb_simple_assert.h &&
+-symlink_file ../TEMPLATES/arb_sleep.h INCLUDE/arb_sleep.h &&
+-symlink_file ../TEMPLATES/arb_stdstr.h INCLUDE/arb_stdstr.h &&
+-symlink_file ../TEMPLATES/arb_str.h INCLUDE/arb_str.h &&
+-symlink_file ../TEMPLATES/arb_unit_test.h INCLUDE/arb_unit_test.h &&
+-symlink_file ../TEMPLATES/arb_unordered_map.h INCLUDE/arb_unordered_map.h &&
+-symlink_file ../TEMPLATES/arb_version.h INCLUDE/arb_version.h &&
+-symlink_file ../TEMPLATES/arbtools.h INCLUDE/arbtools.h &&
+-symlink_file ../TEMPLATES/attributes.h INCLUDE/attributes.h &&
+-symlink_file ../TEMPLATES/bytestring.h INCLUDE/bytestring.h &&
+-symlink_file ../TEMPLATES/cache.h INCLUDE/cache.h &&
+-symlink_file ../TEMPLATES/ChecksumCollector.h INCLUDE/ChecksumCollector.h &&
+-symlink_file ../TEMPLATES/command_output.h INCLUDE/command_output.h &&
+-symlink_file ../TEMPLATES/config_parser.h INCLUDE/config_parser.h &&
+-symlink_file ../TEMPLATES/cxxforward.h INCLUDE/cxxforward.h &&
+-symlink_file ../TEMPLATES/downcast.h INCLUDE/downcast.h &&
+-symlink_file ../TEMPLATES/dupstr.h INCLUDE/dupstr.h &&
+-symlink_file ../TEMPLATES/gccver.h INCLUDE/gccver.h &&
+-symlink_file ../TEMPLATES/malloc.h INCLUDE/malloc.h &&
+-symlink_file ../TEMPLATES/mode_text.h INCLUDE/mode_text.h &&
+-symlink_file ../TEMPLATES/output.h INCLUDE/output.h &&
+-symlink_file ../TEMPLATES/perf_timer.h INCLUDE/perf_timer.h &&
+-symlink_file ../TEMPLATES/SigHandler.h INCLUDE/SigHandler.h &&
+-symlink_file ../TEMPLATES/smartptr.h INCLUDE/smartptr.h &&
+-symlink_file ../TEMPLATES/static_assert.h INCLUDE/static_assert.h &&
+-symlink_file ../TEMPLATES/SuppressOutput.h INCLUDE/SuppressOutput.h &&
+-symlink_file ../TEMPLATES/ttypes.h INCLUDE/ttypes.h &&
+-symlink_file ../TEMPLATES/ut_valgrinded.h INCLUDE/ut_valgrinded.h &&
+-symlink_file ../TEMPLATES/valgrind.h INCLUDE/valgrind.h &&
+-
+-symlink_maybe_no_target ../TEMPLATES/arb_build.h INCLUDE/arb_build.h &&
+-symlink_maybe_no_target ../TEMPLATES/svn_revision.h INCLUDE/svn_revision.h &&
+-
+ # INCLUDE directory
+-
+-symlink_maybe_no_target ../NAMES_COM/names_client.h         INCLUDE/names_client.h &&
+-symlink_maybe_no_target ../NAMES_COM/names_prototypes.h     INCLUDE/names_prototypes.h &&
+-symlink_maybe_no_target ../NAMES_COM/names_server.h         INCLUDE/names_server.h &&
+-
+ symlink_maybe_no_target ../PROBE_COM/PT_com.h               INCLUDE/PT_com.h &&
+ symlink_maybe_no_target ../PROBE_COM/PT_server.h            INCLUDE/PT_server.h &&
+ symlink_maybe_no_target ../PROBE_COM/PT_server_prototypes.h INCLUDE/PT_server_prototypes.h &&
+ 
+-symlink_file ../AISC_COM/C/aisc_func_types.h INCLUDE/aisc_func_types.h &&
+-symlink_file ../AISC_COM/C/aisc_global.h INCLUDE/aisc_global.h &&
+-symlink_file ../AISC_COM/C/client.h INCLUDE/client.h &&
+-symlink_file ../AISC_COM/C/client_types.h INCLUDE/client_types.h &&
+-symlink_file ../AISC_COM/C/client_privat.h INCLUDE/client_privat.h &&
+-symlink_file ../AISC_COM/C/server.h INCLUDE/server.h &&
+-symlink_file ../AISC_COM/C/struct_man.h INCLUDE/struct_man.h &&
+ symlink_file ../ARBDB/ad_cb.h INCLUDE/ad_cb.h &&
+ symlink_file ../ARBDB/ad_cb_prot.h INCLUDE/ad_cb_prot.h &&
+ symlink_file ../ARBDB/ad_config.h INCLUDE/ad_config.h &&
+--- a/SOURCE_TOOLS/build_info.pl
++++ b/SOURCE_TOOLS/build_info.pl
+@@ -275,36 +275,6 @@ my $in_SVN = (-d $ARBHOME.'/.svn');
+ 
+ # update revision info?
+ my ($revision,$is_tag,$branch) = (undef,undef,undef);
+-if ($in_SVN) {
+-  # in SVN checkout -> update revision info
+-  $revision = getRevision();
+-  ($is_tag,$branch) = getBranchOrTag();
+-
+-  # $branch = $RC_BRANCH; # @@@ fake
+-  # $branch = $STABLE_BRANCH; # @@@ fake
+-  # $branch = 'gtk_only'; # @@@ fake
+-  # ($is_tag,$branch) = (1, 'arb-5.20.1'); # @@@ fake
+-  # ($is_tag,$branch) = (1, 'arb-5.19'); # @@@ fake
+-  # ($is_tag,$branch) = (1, 'evalSomething'); # @@@ fake
+-  # ($is_tag,$branch) = (1, 'arb-5.20'); # @@@ fake
+-  # ($is_tag,$branch) = (1, 'arb-5.20-rc1'); # @@@ fake
+-  # ($is_tag,$branch) = (1, 'arb-5.20-rc2'); # @@@ fake
+-
+-  my @svn_revision = (
+-                      '#define ARB_SVN_REVISION      "'.$revision.'"',
+-                      '#define ARB_SVN_BRANCH        "'.$branch.'"',
+-                      '#define ARB_SVN_BRANCH_IS_TAG '.$is_tag,
+-                     );
+-
+-  update($svn_revision_h,@svn_revision);
+-}
+-else {
+-  if (not -f $svn_revision_h) {
+-    die "Missing file '$svn_revision_h'";
+-  }
+-  # use revision info as in source tarball
+-  ($revision,$is_tag,$branch) = getBranchOrTagFromHeader($svn_revision_h);
+-}
+ 
+ my $date = `date '+%d.%b.%Y'`;
+ chomp($date);
+@@ -395,46 +365,6 @@ my $short_version        = undef;
+ my $always_show_revision = 1;
+ 
+ my $orgbranch = $branch; # real branch or branch estimated from tag
+-if ($is_tag==1) {
+-  if ($branch =~ /^arb-[0-9]+\.[0-9]+/o) {
+-    if ($branch =~ /-rc[0-9]+$/o) { $orgbranch = $RC_BRANCH; }
+-    else                          { $orgbranch = $STABLE_BRANCH; }
+-  }
+-  else {
+-    $orgbranch = 'unknown';
+-  }
+-}
+-
+-if ($orgbranch eq $STABLE_BRANCH or $orgbranch eq $RC_BRANCH) {
+-  $always_show_revision = 0;
+-  $svn_tag = 'arb-'.$version_info{MAJOR}.'.'.$version_info{MINOR};
+-  if ($orgbranch eq $RC_BRANCH) {
+-    $svn_tag .= '-rc'.$version_info{CANDIDATE};
+-  }
+-  else {
+-    if ($version_info{PATCHLEVEL} > 0) { $svn_tag .= '.'.$version_info{PATCHLEVEL}; }
+-  }
+-  $short_version = $svn_tag;
+-
+-  if ($is_tag==1) {
+-    # check real SVN-tag vs generated SVN-tag
+-    if ($branch ne $svn_tag) {
+-      die "Version info and SVN-branch-tag mismatch:\n".
+-        "(version suggests svn-tag = '$svn_tag'\n".
+-        " real             svn-tag = '$branch')";
+-    }
+-  }
+-  print "SVN_URL='$ENV{SVN_URL}'\n";
+-  print "SVN_REVISION='$ENV{SVN_REVISION}'\n";
+-}
+-elsif ($is_tag==1) {
+-  $short_version = 'arb-special-'.$branch; # use custom tag
+-}
+-else {
+-  $short_version = 'arb-devel';
+-  if ($branch ne 'trunk') { $short_version .= '-'.$branch; }
+-  $short_version .= '-'.$version_info{MAJOR}.'.'.$version_info{MINOR};
+-}
+ 
+ defined $short_version || die "expected known short_version!";
+ defined $revision || die "expected known revision!";
+--- a/Makefile
++++ b/Makefile
+@@ -1627,7 +1627,7 @@ redo_links: clean_links
+ #********************************************************************************
+ 
+ header_libs:
+-	$(MAKE) -C HEADERLIBS all
++	echo "No headerlibs - just create libarb core" # $(MAKE) -C HEADERLIBS all
+ 
+ #********************************************************************************
+ 
+@@ -1659,7 +1659,7 @@ endif
+ 
+ 
+ binlink:
+-	$(MAKE) -C bin $(BIN_TARGET)
++	echo "No binaries, build library only" # $(MAKE) -C bin $(BIN_TARGET)
+ 
+ preplib:
+ 	(cd lib;$(MAKE) all)

debian/patches/series

 # fix_makefiles.patch
 fix_main_makefile.patch
+ignore_unneeded_stuff.patch