diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-01-02 22:30:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 22:30:11 +0300 |
| commit | d3356e6aab0a4227ca08f4d62ecb144c9fb691c2 (patch) | |
| tree | 013325b2d6b124aaa0e369173422789f4fd0208f /packaging | |
| parent | 23675d6292e8969d68c75b5c157bc5c9bf03f016 (diff) | |
[packaging] Add check for cygwin paths on Windows (#6364)
We don't want to package these, found a few that needed to be removed/fixed.
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/Windows/defs/managed-components | 6 | ||||
| -rwxr-xr-x | packaging/Windows/defs/mono | 8 | ||||
| -rwxr-xr-x | packaging/Windows/defs/mono64 | 8 |
3 files changed, 18 insertions, 4 deletions
diff --git a/packaging/Windows/defs/managed-components b/packaging/Windows/defs/managed-components index 14d1397affa..acfa9021887 100755 --- a/packaging/Windows/defs/managed-components +++ b/packaging/Windows/defs/managed-components @@ -152,6 +152,12 @@ install() exit 1 fi + # make sure we didn't miss any files with cygwin install paths + if grep -R '/tmp/mono'. --exclude=*.pc --exclude=mono-find-provides --exclude=mono-find-requires; then + echo "Found cygwin paths in files, please make sure they're fixed." + exit 1 + fi + popd } diff --git a/packaging/Windows/defs/mono b/packaging/Windows/defs/mono index 62117188f0b..75130900b2f 100755 --- a/packaging/Windows/defs/mono +++ b/packaging/Windows/defs/mono @@ -40,10 +40,12 @@ install() rm -f ${INSTALLDIR}/bin/mono-sgen.* \ ${INSTALLDIR}/bin/mono-boehm.* \ ${INSTALLDIR}/lib/libmono-2.0.* \ + ${INSTALLDIR}/bin/libmonoboehm-2.0.* \ ${INSTALLDIR}/lib/libmonoboehm-2.0.* \ + ${INSTALLDIR}/bin/libmonosgen-2.0.* \ ${INSTALLDIR}/lib/libmonosgen-2.0.* \ - ${INSTALLDIR}/bin/MonoPosixHelper.* \ - ${INSTALLDIR}/lib/MonoPosixHelper.* \ + ${INSTALLDIR}/bin/*MonoPosixHelper.* \ + ${INSTALLDIR}/lib/*MonoPosixHelper.* \ ${INSTALLDIR}/bin/mono \ ${INSTALLDIR}/bin/pedump \ ${INSTALLDIR}/bin/mono-package-runtime \ @@ -89,6 +91,8 @@ install() chmod a+x *.bat *.exe popd popd + + find ${INSTALLDIR} -name monodoc.dll.config -exec sed -i 's#value=".*/lib/monodoc#value="C:\\Program Files (x86)\\Mono\\lib\\monodoc#g' {} \; } prerequisites() diff --git a/packaging/Windows/defs/mono64 b/packaging/Windows/defs/mono64 index d5a7362da34..f655ba836e6 100755 --- a/packaging/Windows/defs/mono64 +++ b/packaging/Windows/defs/mono64 @@ -40,10 +40,12 @@ install() rm -f ${INSTALLDIR}/bin/mono-sgen.* \ ${INSTALLDIR}/bin/mono-boehm.* \ ${INSTALLDIR}/lib/libmono-2.0.* \ + ${INSTALLDIR}/bin/libmonoboehm-2.0.* \ ${INSTALLDIR}/lib/libmonoboehm-2.0.* \ + ${INSTALLDIR}/bin/libmonosgen-2.0.* \ ${INSTALLDIR}/lib/libmonosgen-2.0.* \ - ${INSTALLDIR}/bin/MonoPosixHelper.* \ - ${INSTALLDIR}/lib/MonoPosixHelper.* \ + ${INSTALLDIR}/bin/*MonoPosixHelper.* \ + ${INSTALLDIR}/lib/*MonoPosixHelper.* \ ${INSTALLDIR}/bin/mono \ ${INSTALLDIR}/bin/pedump \ ${INSTALLDIR}/bin/mono-package-runtime \ @@ -83,6 +85,8 @@ install() chmod a+x *.bat *.exe popd popd + + find ${INSTALLDIR} -name monodoc.dll.config -exec sed -i 's#value=".*/lib/monodoc#value="C:\\Program Files\\Mono\\lib\\monodoc#g' {} \; } prerequisites() |