소스 검색

Fixed the mono install a bit

msmith-techempower 10 년 전
부모
커밋
4e0f564ddf
2개의 변경된 파일9개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      frameworks/CSharp/aspnet/setup_nginx.sh
  2. 8 6
      toolset/setup/linux/languages/mono.sh

+ 1 - 1
frameworks/CSharp/aspnet/setup_nginx.sh

@@ -28,5 +28,5 @@ nginx -c $TROOT/nginx.conf -g "worker_processes ${MAX_THREADS};"
 
 # To debug, use --printlog --verbose --loglevels=All
 for port in $(seq $port_start $port_end); do
-  fastcgi-mono-server4 --applications=/:${TROOT}/src --socket=tcp:127.0.0.1:$port &
+  fastcgi-mono-server4 --applications=/:$TROOT/src --socket=tcp:127.0.0.1:$port &
 done

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

@@ -16,12 +16,14 @@ echo "deb http://jenkins.mono-project.com/repo/debian sid main" | sudo tee /etc/
 sudo apt-get update
 
 # Find the most recent snapshot
-SNAPSHOT=$(apt-cache search 'mono-snapshot-.*-assemblies' | cut -d'-' -f3 | tail -1)
+#SNAPSHOT=$(apt-cache search 'mono-snapshot-.*-assemblies' | cut -d'-' -f3 | tail -1)
+SNAPSHOT="20150202010831"
 
 # save environment
 
-echo "export SNAPDATE=$SNAPSHOT" > $IROOT/mono.installing
-echo "export MONO_HOME=$IROOT/mono-snapshot-$SNAPDATE" >> $IROOT/mono.installing
+MONO_HOME=$IROOT/mono-snapshot-$SNAPSHOT
+echo "export SNAPSHOT=$SNAPSHOT" > $IROOT/mono.installing
+echo "export MONO_HOME=$MONO_HOME" >> $IROOT/mono.installing
 echo "export MONO_PATH=$MONO_HOME/lib/mono/4.5" >> $IROOT/mono.installing
 echo "export MONO_CFG_DIR=$MONO_HOME/etc" >> $IROOT/mono.installing
 echo -e "export PATH=$MONO_HOME/bin:\$PATH" >> $IROOT/mono.installing
@@ -36,12 +38,12 @@ rm -rf $MONO_HOME && mkdir -p $MONO_HOME
 
 # Download and extract debs
 fw_apt_to_iroot mono-snapshot-$SNAPSHOT
-fw_apt_to_iroot mono-snapshot-${SNAPSHOT}-assemblies mono-snapshot-$SNAPSHOT
+fw_apt_to_iroot mono-snapshot-$SNAPSHOT-assemblies mono-snapshot-$SNAPSHOT
 
 # Simplify paths
 mv $MONO_HOME/opt/mono-*/* $MONO_HOME
-file $MONO_HOME/bin/* | grep "POSIX shell script" | awk -F: '{print $1}' | xargs sed -i "s|/opt/mono-$SNAPDATE|$MONO_HOME|g"
-sed -i "s|/opt/mono-$SNAPDATE|$MONO_HOME|g" $MONO_HOME/lib/pkgconfig/*.pc $MONO_HOME/etc/mono/config
+file $MONO_HOME/bin/* | grep "POSIX shell script" | awk -F: '{print $1}' | xargs sed -i "s|/opt/mono-$SNAPSHOT|$MONO_HOME|g"
+sed -i "s|/opt/mono-$SNAPSHOT|$MONO_HOME|g" $MONO_HOME/lib/pkgconfig/*.pc $MONO_HOME/etc/mono/config
 
 echo "mozroots --import --sync" >> $IROOT/mono.installing