瀏覽代碼

Install mono from snapshot packages and fix nginx

Pēteris Ņikiforovs 10 年之前
父節點
當前提交
da542e85e0

+ 2 - 0
frameworks/CSharp/aspnet/install.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
 fw_depends nginx mono xsp
+
+wget -q -N http://nuget.org/nuget.exe -O ${TROOT}/lib/.nuget/NuGet.exe

+ 3 - 9
frameworks/CSharp/aspnet/setup_nginx.sh

@@ -2,17 +2,11 @@
 
 sed -i 's|localhost|'"$DBHOST"'|g' src/Web.config
 
-# todo move somewhere else
-wget -N http://nuget.org/nuget.exe -O lib/.nuget/NuGet.exe
-
 # build
+. mono-snapshot mono/20141222114925
 cd src
 rm -rf bin obj
 xbuild Benchmarks.sln /p:Configuration=Release
-
-# http://stackoverflow.com/questions/4239645/does-the-razor-view-engine-work-for-mono
-rm bin/Microsoft.Web.Infrastructure.dll
-
 cd ..
 
 # nginx
@@ -26,13 +20,13 @@ done
 conf+="}"
 echo -e $conf > $TROOT/nginx.upstream.conf
 
-$NGINX_HOME/sbin/nginx -c $TROOT/nginx.conf -g "${MAX_THREADS}"
+$NGINX_HOME/sbin/nginx -c $TROOT/nginx.conf -g "worker_processes ${MAX_THREADS};"
 
 # Start fastcgi for each thread
 # To debug, use --printlog --verbose --loglevels=All
 current=9001
 end=$(($current+$MAX_THREADS))
 while [ $current -lt $end ]; do
-  fastcgi-mono-server4 --applications=/:$(pwd)/src --socket=tcp:127.0.0.1:$current
+  fastcgi-mono-server4 --applications=/:${pwd}/src --socket=tcp:127.0.0.1:$current &
   let current=current+1
 done

+ 8 - 6
toolset/setup/linux/languages/mono.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 
 post_install () {
+  . mono-snapshot mono/20141222114925
+  
   echo "Installing SSL certificates"
-  sudo mozroots --import --sync --machine
-  echo -e 'y\ny\ny\n' | sudo certmgr -ssl -m https://nuget.org
+  sudo env "PATH=$PATH" mozroots --import --sync --machine
+  echo -e 'y\ny\ny\n' | sudo env "PATH=$PATH" certmgr -ssl -m https://nuget.org
 
   # For apps that need write access to the registry
   sudo mkdir -p /etc/mono/registry
@@ -16,11 +18,11 @@ RETCODE=$(fw_exists $IROOT/mono.installed)
   return 0
 }
 
-echo "Installing mono from official Xamarin packages for Debian"
-curl -s http://download.mono-project.com/repo/xamarin.gpg | sudo apt-key add -
-echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/xamarin.list
+echo "Installing mono from CI packages"
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+echo "deb http://jenkins.mono-project.com/repo/debian sid main" | sudo tee /etc/apt/sources.list.d/mono-jenkins.list
 sudo apt-get update
-sudo apt-get -y install mono-complete
+sudo apt-get install -y mono-snapshot-20141222114925
 
 post_install
 

+ 13 - 4
toolset/setup/linux/languages/xsp.sh

@@ -1,9 +1,18 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists $IROOT/xsp.installed)
+RETCODE=$(fw_exists ${IROOT}/xsp.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-echo "Installing XSP"
-sudo apt-get -y install mono-xsp4 mono-fastcgi-server4
+fw_depends mono
 
-touch $IROOT/xsp.installed
+. mono-snapshot mono/20141222114925
+
+git clone git://github.com/mono/xsp
+cd xsp
+git checkout e272a2c006211b6b03be2ef5bbb9e3f8fefd0768
+
+./autogen.sh --prefix=${MONO_PREFIX}
+make
+sudo make install
+
+touch ${IROOT}/xsp.installed