Changeset 34080

Timestamp:

Jun 26, 2012, 11:18:50 AM (14 years ago)

Author:

eugene

Message:

changes to configure.ac to support debug-build; fixes for pedantic gcc warnings

Location:

trunk

Files:

• Nebulous (modified) (1 prop)
• Nebulous/nebclient/tests/tap/src/tap.c (modified) (3 diffs)
• dvoTools/configure.ac (modified) (2 diffs)
• extsrc/gpcsw/Makefile.in (modified) (1 diff)
• extsrc/gpcsw/configure.tcsh (modified) (4 diffs)
• glueforge/templates/psdb/configure_ac.tt (modified) (2 diffs)
• ippScripts (modified) (1 prop)
• ippScripts/scripts/addstar_run.pl (modified) (3 diffs)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippToPsps/configure.ac (modified) (2 diffs)

trunk/Nebulous

@@ +1 @@
+MYMETA.json
+MYMETA.yml
 Build
 META.yml

@@ +1 @@
+MYMETA.json
+MYMETA.yml
 Build
 META.yml

trunk/Nebulous/nebclient/tests/tap/src/tap.c

@@ -87 +87 @@
     if(test_name != NULL) {
         va_start(ap, test_name);
-        vasprintf(&local_test_name, test_name, ap);
+        int status = vasprintf(&local_test_name, test_name, ap);
+        if (status) {/* warning? */}
         va_end(ap);
 
@@ -303 +304 @@
 
     va_start(ap, fmt);
-    asprintf(&skip_msg, fmt, ap);
+    int status = asprintf(&skip_msg, fmt, ap);
+    if (status) {/* warning? */}
     va_end(ap);
 
@@ -328 +330 @@
 
     va_start(ap, fmt);
-    vasprintf(&todo_msg, fmt, ap);
+    int status = vasprintf(&todo_msg, fmt, ap);
+    if (status) {/* warning? */}
     va_end(ap);
 

trunk/dvoTools/configure.ac

@@ -8 +8 @@
 AM_MAINTAINER_MODE
 
-IPP_STDCFLAGS
+IPP_STDLDFLAGS
 
 AC_LANG(C)
@@ -21 +21 @@
 
 IPP_STDOPTS
-CFLAGS="${CFLAGS=} -Wall -Werror"
+IPP_STDCFLAGS
 
 AC_CONFIG_FILES([

trunk/extsrc/gpcsw/Makefile.in

@@ -9 +9 @@
 
 clean:
-        echo "dummy clean"
+        cd gpcsrc && make -C fits/libfh clean
+        cd gpcsrc && make -C fits/libfhreg clean
+        cd gpcsrc && make -C analysis/libpscoords clean
+        cd gpcsrc && make -C fits/burntool clean
+        cd gpcsrc && make -C fits/tiltystreak clean
 
 update:

trunk/extsrc/gpcsw/configure.tcsh

@@ -7 +7 @@
 
 # evaluate command-line options
+set vararch = 0
+set optimize = 0
+set pedantic = 1
+set no_as_needed = 0
+set debug_build = 0
+set memcheck = 0
+set use_tcmalloc = 0
+set use_gnu99 = 0
+set no_largefiles = 0
+
 set prefix  = ""
 set bindir  = ""
@@ -22 +32 @@
 
 while ("$1" != "") 
- echo "checking $1"
  switch ("$1")
-  # switch options passed by build systems which we ignore
+  # options passed by build systems which we ignore
   case --enable-maintainer-mode
   case --no-create
   case --no-recursion
-  case --enable-optimize
   case --disable-shared
   case --enable-shared
   case --disable-static
   case --enable-static
+  # skipped by gpcsw, but not Ohana
+  case --enable-optimize
   case --enable-profile
   case --pedantic
@@ -43 +53 @@
   case --oldincludedir*
   case --infodir*
+  # skipped by gpcsw, but not Ohana
   case --exec-prefix*
   case --libdir*
@@ -55 +66 @@
      endif
    endif
+   breaksw;
+  case --enable-no-as-needed
+   set no_as_needed = 1
+   breaksw;
+  case --enable-debug-build
+   set debug_build = 1
    breaksw;
   case --prefix*

trunk/glueforge/templates/psdb/configure_ac.tt

@@ -13 +13 @@
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
+
+IPP_STDLDFLAGS
 
 AC_CONFIG_TESTDIR([tests])
@@ -54 +56 @@
 dnl is this the best was to setup recursive CFLAGS?
 IPP_STDOPTS
-dnl -Werror causes problems on OSX as inttypes.h uses some non standard C types
-[% pkg_name %]_CFLAGS="-Wall -pedantic -fno-strict-aliasing"
+IPP_STDCFLAGS
+
+[% pkg_name %]_CFLAGS="-pedantic -fno-strict-aliasing"
 AC_SUBST([[% pkg_name %]_CFLAGS])
 

trunk/ippScripts

@@ +1 @@
+MYMETA.json
+MYMETA.yml
 Build
 META.yml

@@ +1 @@
+MYMETA.json
+MYMETA.yml
 Build
 META.yml

trunk/ippScripts/scripts/addstar_run.pl

@@ -261 +261 @@
            
             my $realFile = $ipprc->file_resolve($fpaObjects) or  &my_die("Unable to resolve $fpaObjects", $add_id, $PS_EXIT_SYS_ERROR);
-            
-            
-           
+
+            # most cameras use CHIP_HEADER.  other exceptions:
+            # gpc1 @ camera : PHU_HEADER
+            # gpc1 @ staticsky : NOMINAL (is uncalibrated)
+
+            # temporary hard-wired info
+            my $zeroPointOption = "CHIP_HEADER";
+            if (($camdir =~ /gpc1/) && ($stage =~ /staticsky/)) {
+                $zeroPointOption = "NOMINAL";
+            }           
+            if (($camdir =~ /gpc1/) && ($stage =~ /cam/)) {
+                $zeroPointOption = "PHU_HEADER";
+            }           
 
             # require a defined output dvo database to run addstar (ie, refuse to use the .ptolemyrc default)
@@ -269 +279 @@
             $command .= " -D CAMERA $camdir";
             $command .= " -D CATDIR $minidvodb_path";
+            $command .= " -D ZERO_POINT_OPTION $zeroPointOption";
             $command .= " $realFile";
             $command .= " -use-name $fpaObjects"; # DVO wants the neb-name as a file reference
@@ -275 +286 @@
                 $command .= " -accept-astrom ";
             }  #careful here - this matches staticsky and staticsky_multi
+
             my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
 

trunk/ippToPsps/configure.ac

@@ -9 +9 @@
 AM_MAINTAINER_MODE
 
-IPP_STDCFLAGS
+IPP_STDLDFLAGS
 
 AC_LANG(C)
@@ -31 +31 @@
 dnl Set CFLAGS for build
 IPP_STDOPTS
-CFLAGS="${CFLAGS=} -Wall -Werror"
+IPP_STDCFLAGS
+dnl CFLAGS="${CFLAGS=} -Wall -Werror"
 echo "IPPTOPSPS_CFLAGS: $IPPTOPSPS_CFLAGS"
 echo "IPPTOPSPS_LIBS: $IPPTOPSPS_LIBS"

@@ +1 @@
+MYMETA.json
+MYMETA.yml
 Build
 META.yml

@@ +1 @@
+MYMETA.json
+MYMETA.yml
 Build
 META.yml