Prechádzať zdrojové kódy

Added CSharp to travis and fixed cpoll on ubuntu12

For some reason, the CXX (and other) flags were not being used
by cppsp_0.2.3 on ubuntu12. Now we simply set those flags during
the install via sed.
msmith-techempower 11 rokov pred
rodič
commit
9e9392450a

+ 6 - 6
.travis.yml

@@ -27,12 +27,12 @@ env:
     - "TESTDIR=C/lwan"
     - "TESTDIR=C/duda"
     - "TESTDIR=C/onion"
-    - "TESTDIR=C#/aspnet"
-    # - "TESTDIR=C#/aspnet-stripped"
-    - "TESTDIR=C#/evhttp-sharp"
-    # - "TESTDIR=C#/HttpListener"
-    - "TESTDIR=C#/nancy"
-    - "TESTDIR=C#/servicestack"
+    - "TESTDIR=CSharp/aspnet"
+    # - "TESTDIR=CSharp/aspnet-stripped"
+    - "TESTDIR=CSharp/evhttp-sharp"
+    # - "TESTDIR=CSharp/HttpListener"
+    - "TESTDIR=CSharp/nancy"
+    - "TESTDIR=CSharp/servicestack"
     - "TESTDIR=C++/cpoll_cppsp"
     - "TESTDIR=C++/treefrog"
     - "TESTDIR=C++/ULib"

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

@@ -6,6 +6,4 @@ clean:
 	$(MAKE) -C $(IROOT)/cppsp_0.2.3 clean
 
 cppsp_0.2.3:
-	$(MAKE) CXX=g++-4.8 -C $(IROOT)/cppsp_0.2.3 all
-
-
+	$(MAKE) -C $(IROOT)/cppsp_0.2.3 all

+ 5 - 2
frameworks/C++/cpoll_cppsp/install.sh

@@ -12,7 +12,10 @@ fw_untar cppsp_0.2.3.tar.xz
 # 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
+cp -R cppsp_rel0.2.3/ ${IROOT}/cppsp_0.2.3
 rm -rf cppsp_rel0.2.3/
 
-touch $IROOT/cppsp.installed
+sed -i 's|CXX := .*|CXX := g++-4.8|g' ${IROOT}/cppsp_0.2.3/makefile
+sed -i 's|-Wall|-w|g' ${IROOT}/cppsp_0.2.3/makefile
+
+touch ${IROOT}/cppsp.installed