Browse Source

Minor cpoll cleanups

Hamilton Turner 10 years ago
parent
commit
e628c9f5f6
2 changed files with 12 additions and 2 deletions
  1. 1 1
      frameworks/C++/cpoll_cppsp/Makefile
  2. 11 1
      frameworks/C++/cpoll_cppsp/install.sh

+ 1 - 1
frameworks/C++/cpoll_cppsp/Makefile

@@ -3,7 +3,7 @@ all: cppsp_0.2.3
 clean:
 clean:
 	rm -f www/*.so www/*.txt
 	rm -f www/*.so www/*.txt
 	rm -f www/forcedynamic.cppsm.*
 	rm -f www/forcedynamic.cppsm.*
-	cd $(IROOT)/cppsp_0.2.3 all && $(MAKE) clean
+	$(MAKE) -C $(IROOT)/cppsp_0.2.3 clean
 
 
 cppsp_0.2.3:
 cppsp_0.2.3:
 	$(MAKE) CXX=g++-4.8 -C $(IROOT)/cppsp_0.2.3 all
 	$(MAKE) CXX=g++-4.8 -C $(IROOT)/cppsp_0.2.3 all

+ 11 - 1
frameworks/C++/cpoll_cppsp/install.sh

@@ -1,8 +1,18 @@
 #!/bin/bash
 #!/bin/bash
 
 
+RETCODE=$(fw_exists cppsp.installed)
+[ ! "$RETCODE" == 0 ] || { return 0; }
+
 sudo apt-get install -y postgresql-server-dev-9.3 libpq-dev
 sudo apt-get install -y postgresql-server-dev-9.3 libpq-dev
 
 
 fw_get -O cppsp_0.2.3.tar.xz http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_0.2.3.tar.xz
 fw_get -O cppsp_0.2.3.tar.xz http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_0.2.3.tar.xz
 fw_untar cppsp_0.2.3.tar.xz
 fw_untar cppsp_0.2.3.tar.xz
 
 
-mv cppsp_rel0.2.3/ cppsp_0.2.3
+# Using cp+rm over mv intentionally, because apparently this download
+# causes oddball issues when mv'ed around inside a folder mounted 
+# inside of VirtualBox (may have something to do with case-sensitive 
+# filesystems)
+cp -R cppsp_rel0.2.3/ $IROOT/cppsp_0.2.3
+rm -rf cppsp_rel0.2.3/
+
+touch cppsp.installed