Changeset 28383

Timestamp:

Jun 16, 2010, 8:53:51 PM (16 years ago)

Author:

eugene

Message:

deactivate automatic qt build; point verify streaks at qtlib in ipp home directory

Location:

trunk

Files:

• magic/Makefile (modified) (1 diff)
• magic/verify/Makefile (modified) (2 diffs)
• psconfig/psbuild (modified) (2 diffs)

trunk/magic/Makefile

@@ -24 +24 @@
         tar xvzf $(MAGIC_DIR)/magic.tgz
         tar xvzf $(MAGIC_DIR)/ssa-core-cpp.tgz
-        tar xvzf $(QTSRC)
         cp Makefile.magic magic/Makefile.magic
         cp magic/VerifyStreaks/main.cpp verify/VerifyStreaks.cpp
+
+# tar xvzf $(QTSRC)
 
 qt-everywhere: $(QTDIR)/lib/libQtCore.so

trunk/magic/verify/Makefile

@@ -4 +4 @@
 CXXFLAGS = -W -Wall -O3 -DNDEBUG
 # CXXFLAGS = -W -Wall -g
+
+QTLIB_INC = /home/panstarrs/ipp/src/qtlib/include
+QTLIB_LIB = /home/panstarrs/ipp/src/qtlib/lib
 
 SSA_SRC = ../ssa-core-cpp/src
@@ -12 +15 @@
 PSINC_DIR = $(PSCONFDIR)/$(PSCONFIG)/include
 
-CINC = -I. -I$(SSA_SRC) -I$(PSINC_DIR) -I$(MAGIC_SRC)
-CLIB = -L. -L$(SSA_LIB) -I$(PSINC_DIR) -lcfitsio -lSSA -lQtCore -lQtGui
+CINC = -I. -I$(QTLIB_INC) -I$(SSA_SRC) -I$(PSINC_DIR) -I$(MAGIC_SRC)
+CLIB = -L. -L$(QTLIB_LIB) -L$(SSA_LIB) -I$(PSINC_DIR) -lcfitsio -lSSA -lQtCore -lQtGui
 
 all : $(TARGETS)

trunk/psconfig/psbuild

@@ -81 +81 @@
         $developer = 1;
         $optimize = 1;
-        $magic = 1;
+        $magic = 1;
         shift; next;
     }
@@ -183 +183 @@
     # the operations system needs to first update the magic software
     if ($magic) {
-        $homedir = `pwd`; chomp $homedir;
-        chdir "../magic";
-
-        if (! -d magic || ! -d ssa-core-cpp || ! -d qt-everywhere-opensource-src-4.6.1) {
-            $status = vsystem ("make update");
-            if ($status) { die "failed to untar magic directories"; }
-        } else {
-            print "magic directories exist; run make update manually if needed\n";
-        }
-        chdir $homedir;
+        $homedir = `pwd`; chomp $homedir;
+        chdir "../magic";
+
+        if (! -d "magic" || ! -d "ssa-core-cpp") {
+            $status = vsystem ("make update");
+            if ($status) { die "failed to untar magic directories"; }
+        } else {
+            print "magic directories exist; run make update manually if needed\n";
+        }
+        chdir $homedir;
     }