[redistricter] r216 committed - cleanups

[redist...@googlecode.com]

Revision: 216
Author: brian...@gmail.com
Date: Sun Jun 5 08:32:18 2011
Log: cleanups
http://code.google.com/p/redistricter/source/detail?r=216

Modified:
/trunk/Makefile
/trunk/runallstates.py
/trunk/setupstatedata.py

=======================================
--- /trunk/Makefile Sat Feb 26 12:03:21 2011
+++ /trunk/Makefile Sun Jun 5 08:32:18 2011
@@ -104,6 +104,7 @@

drend_static: ${DRENDOBJS}
$(CXX) ${CXXFLAGS} $(DRENDOBJS) $(STATICPNG) -lpthread -lz
/usr/local/lib/libprotobuf.a -o drend_static
+ strip drend_static

ANALYZEOBJS:=${COREOBJS} analyze.o

=======================================
--- /trunk/runallstates.py Tue Mar 1 05:23:04 2011
+++ /trunk/runallstates.py Sun Jun 5 08:32:18 2011
@@ -1193,7 +1193,7 @@
time.sleep(1)
ret = p.poll()
if ret != 0:
- self.addStopReason("drend failed (%d): %s\n" % (ret, cmdstr))
+ self.addStopReason("drend failed (%s): %s\n" % (ret, cmdstr))
sys.stderr.write(self.stopreason + '\n')
self.softfail = True
return False
=======================================
--- /trunk/setupstatedata.py Sun Feb 13 15:07:11 2011
+++ /trunk/setupstatedata.py Sun Jun 5 08:32:18 2011
@@ -115,14 +115,6 @@
${bindir}/drend -B ${dpath}/${stu_bin} $${${stu}DISTOPT} --mppb
${dpath}/${stu}_sm.mppb --pngout ${dpath}/${stu}_start_sm.png
--loadSolution ${dpath}/${stu}current.dsz
"""

-# don't need these, compileBinaryData does it
-compileBinaryData_rules_ = """
-${dpath}/${stu}.gbin: ${dpath}/.uf1 linkfixup
- ./linkfixup -U ${dpath}/.uf1 -o ${dpath}/${stu}.gbin
-
-${dpath}/${stu}.pb: ${dpath}/.uf1 linkfixup
- ./linkfixup -U ${dpath}/.uf1 -p ${dpath}/${stu}.pb
-"""

# we don't need these when building from shapefile
old_makepolys_rules_ = ("""