Changeset 26890

Timestamp:

Feb 10, 2010, 7:22:24 PM (16 years ago)

Author:

eugene

Message:

updates from eam_branches/20091201 (main changes is due to DOS-style line breaks on the trunk; add VerifyStreaks)

Location:

trunk/magic

Files:

• Makefile (modified) (3 diffs)
• remove/src (modified) (1 prop)
• remove/src/Makefile.am (modified) (1 diff)
• remove/src/diffedpixels.c (modified) (1 prop)
• remove/src/streaksremove.c (modified) (1 diff)
• verify (copied) (copied from branches/eam_branches/20091201/magic/verify )
• verify/Makefile (copied) (copied from branches/eam_branches/20091201/magic/verify/Makefile )
• verify/verifystreaks.sh (copied) (copied from branches/eam_branches/20091201/magic/verify/verifystreaks.sh )

trunk/magic/Makefile

@@ -2 +2 @@
 default: all
 
-all: ssa-core-cpp magic
+all: ssa-core-cpp magic verify
 
-install: magic.install
+install: magic.install verify.install
 
 clean:
@@ -15 +15 @@
         tar xvzf ~/ssa-core-cpp.tgz
         cp Makefile.magic magic/Makefile.magic
+        cp magic/VerifyStreaks/main.cpp verify/VerifyStreaks.cpp
 
 ssa-core-cpp: ssa-core-cpp/build/libSSA.a
@@ -29 +30 @@
         if [ -d magic ]; then (cd magic && make -f Makefile.magic install); fi
 
+update.verify:
+        cp magic/VerifyStreaks/main.cpp verify/VerifyStreaks.cpp
+
+verify: verify/VerifyStreaks
+
+verify/VerifyStreaks:
+        if [ -d magic ]; then (cd verify && make); fi
+
+verify.install:
+        if [ -d magic ]; then (cd verify && make install); fi
+
+# REMOVE = remove/src
+# 
+# remove: FORCE
+#       @cd $(REMOVE) && make -f Makefile.simple all
+# 
+# remove.install: remove
+#       @cd $(REMOVE) && make -f Makefile.simple install
+
 FORCE:

trunk/magic/remove/src

@@ -11 +11 @@
 config.h.in
 stamp-h1
-

@@ -11 +11 @@
 config.h.in
 stamp-h1
-

trunk/magic/remove/src/Makefile.am

@@ -84 +84 @@
         streaksextern.h \
         streaksio.h     \
-        streaksremove.h \
         streaksVersionDefinitions.h
 

trunk/magic/remove/src/streaksremove.c

@@ -273 +273 @@
         } else {
             fprintf(sfiles->statsFile, "%s", statsMDC);
-            psFree((void *)statsMDC);
+            psFree(statsMDC);
             fclose(sfiles->statsFile);
             sfiles->statsFile = NULL;

@@ -11 +11 @@
 config.h.in
 stamp-h1
-