X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=packaging%2FWindows%2Fdefs%2Fmono;h=62117188f0b9be367d47b02347b51f7b8c6ed0d6;hb=2e1afbd7b750d537528fb712353f4b189dce92fa;hp=2897ea1eaf4a5a677aad321e2bfae4c1af6142f9;hpb=69f8abf794b5215882cf39a59d572ac29039f29c;p=mono.git

diff --git a/packaging/Windows/defs/mono b/packaging/Windows/defs/mono
index 2897ea1eaf4..62117188f0b 100755
--- a/packaging/Windows/defs/mono
+++ b/packaging/Windows/defs/mono
@@ -29,7 +29,7 @@ build()
 	pushd ${REPODIR}
 	report "Building Mono"
 	mkdir -p ${INSTALLDIR}
-	WORKSPACE=${REPODIR} EXTRA_CONF_FLAGS="--prefix=${INSTALLDIR}" ghprbPullId=1 CI_TAGS="no-tests" label="w32" scripts/ci/run-jenkins.sh || error "*** Could not run autogen ***"
+	EXTRA_CONF_FLAGS="--prefix=${INSTALLDIR}" CI_TAGS="no-tests" label="w32" scripts/ci/run-jenkins.sh || error "*** Could not run autogen ***"
 	popd
 }
 
@@ -56,6 +56,7 @@ install()
 	cp -a msvc/build/sgen/Win32/bin/Release/mono-2.0-sgen.dll	${INSTALLDIR}/bin/
 	cp -a msvc/build/sgen/Win32/lib/Release/mono-2.0-sgen.lib	${INSTALLDIR}/lib/
 	cp -a msvc/build/sgen/Win32/bin/Release/mono-2.0-sgen.pdb	${INSTALLDIR}/lib/
+	cp -a msvc/build/sgen/Win32/lib/Release/libmono-static-sgen.lib	${INSTALLDIR}/lib/
 	cp -a msvc/build/sgen/Win32/bin/Release/MonoPosixHelper.dll	${INSTALLDIR}/bin/
 	cp -a msvc/build/sgen/Win32/lib/Release/MonoPosixHelper.lib	${INSTALLDIR}/lib/
 	cp -a msvc/build/sgen/Win32/bin/Release/MonoPosixHelper.pdb	${INSTALLDIR}/lib/
@@ -64,6 +65,7 @@ install()
 	cp -a msvc/build/boehm/Win32/bin/Release/mono-2.0-boehm.dll	${INSTALLDIR}/bin/
 	cp -a msvc/build/boehm/Win32/lib/Release/mono-2.0-boehm.lib	${INSTALLDIR}/lib/
 	cp -a msvc/build/boehm/Win32/bin/Release/mono-2.0-boehm.pdb	${INSTALLDIR}/lib/
+	cp -a msvc/build/boehm/Win32/lib/Release/libmono-static-boehm.lib	${INSTALLDIR}/lib/
 	cp -a ${INSTALLDIR}/bin/mono-sgen.exe	${INSTALLDIR}/bin/mono.exe
 	cp -a ${INSTALLDIR}/bin/mono-sgen.pdb	${INSTALLDIR}/bin/mono.pdb
 	popd
@@ -75,7 +77,7 @@ install()
 				then EXENAME=$(basename `grep -ho '.:/.*\.exe' $i`)
 			fi
 			if [ -f "../lib/mono/${RUNTIME}/${EXENAME}" ]
-				then sed "s#@@RUNTIME@@#${RUNTIME}#g" $(dirname $0)/../resources/wrapper.bat > $i.bat
+				then sed "s#@@RUNTIME@@#${RUNTIME}#g" ${REPODIR}/packaging/Windows/resources/wrapper.bat > $i.bat
 				sed -i "s#@@COMMAND@@#${EXENAME}#g" $i.bat
 				sed -i 's#/#\\#g' $i.bat
 			fi