Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Visual C++ Redistributable Packages for Visual Studio Extensions #21

Merged
merged 6 commits into from Jul 11, 2018
Merged

Fix Visual C++ Redistributable Packages for Visual Studio Extensions #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f2d444e
Correctly install vcrun2015 64 bit
julianrichen Jul 11, 2018
1876e8a
Correctly install vcrun2013 64 bit
julianrichen Jul 11, 2018
239717f
Fix dll search path x64 -> x86
julianrichen Jul 11, 2018
46923bc
Correctly install vcrun2012 64 bit
julianrichen Jul 11, 2018
008d5a1
Correctly install vcrun2010 64 bit
julianrichen Jul 11, 2018
1636ded
Add vcrun2017 extension
julianrichen Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
152 changes: 140 additions & 12 deletions extension/org.winepak.Platform.Extension.vcrun2010.yml
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ modules:
buildsystem: simple
build-commands:
- install -d ${FLATPAK_DEST}/bin
- install apply_extra* ${FLATPAK_DEST}/bin
- install apply_extra ${FLATPAK_DEST}/bin
sources:
# https://www.microsoft.com/en-us/download/details.aspx?id=14632
- type: extra-data
Expand All @@ -23,13 +25,103 @@ modules:
url: https://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe
size: 5718872
sha256: b06546ddc8ca1e3d532f3f2593e88a6f49e81b66a9c2051d58508cc97b6a2023
filename: vcrun2010_x64.exe
filename: vc_redist.x64.exe
# https://www.microsoft.com/en-us/download/details.aspx?id=5555
- type: extra-data
url: https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe
size: 5073240
sha256: 8162b2d665ca52884507ede19549e99939ce4ea4a638c537fa653539819138c8
filename: vcrun2010_x86.exe
filename: vc_redist.x86.exe
- type: script
only-arches:
- x86_64
dest-filename: apply_extra
commands:
- /app/bin/apply_extra64
- /app/bin/apply_extra32
-
- rm -rf extracted
- rm -rf extracted_dlls
- type: script
only-arches:
- i386
dest-filename: apply_extra
commands:
- /app/bin/apply_extra32
-
- rm -rf extracted
- rm -rf extracted_dlls
- type: script
only-arches:
- x86_64
dest-filename: apply_extra64
commands:
- OPERATION="vcrun2010"
- ARCH="x64"
- SOURCE_FILE="vc_redist.x64.exe"
- DIR_EXTRACTED="extracted/${ARCH}"
- DIR_EXTRACTED_DLLS="extracted_dlls/${ARCH}"
- DIR_DLLS="dlls/${ARCH}"
-
- mkdir -p $DIR_EXTRACTED
- mkdir -p $DIR_EXTRACTED_DLLS
- mkdir -p $DIR_DLLS
-
- echo "${OPERATION} (${ARCH}): Extracting redistributable"
- cabextract -q -d $DIR_EXTRACTED -L $SOURCE_FILE
- cabextract -q -d $DIR_EXTRACTED_DLLS -L ${DIR_EXTRACTED}/*.cab
-
- # Grab the DLLs we need and correct naming
- echo "${OPERATION} (${ARCH}): Saving and renaming the correct DLLs"
- mv "${DIR_EXTRACTED_DLLS}/f_central_atl100_x64" "${DIR_DLLS}/atl100.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfc100_x64" "${DIR_DLLS}/mfc100.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfc100u_x64" "${DIR_DLLS}/mfc100u.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfcm100_x64" "${DIR_DLLS}/mfcm100.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfcm100u_x64" "${DIR_DLLS}/mfcm100u.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_msvcp100_x64" "${DIR_DLLS}/msvcp100.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_msvcr100_x64" "${DIR_DLLS}/msvcr100.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_vcomp100_x64" "${DIR_DLLS}/vcomp100.dll"
-
- # Clean-up
- echo "${OPERATION} (${ARCH}): Cleaning-up"
- rm -rf $DIR_EXTRACTED
- rm -rf $DIR_EXTRACTED_DLLS
- rm $SOURCE_FILE
- type: script
dest-filename: apply_extra32
commands:
- OPERATION="vcrun2010"
- ARCH="x86"
- SOURCE_FILE="vc_redist.x86.exe"
- DIR_EXTRACTED="extracted/${ARCH}"
- DIR_EXTRACTED_DLLS="extracted_dlls/${ARCH}"
- DIR_DLLS="dlls/${ARCH}"
-
- mkdir -p $DIR_EXTRACTED
- mkdir -p $DIR_EXTRACTED_DLLS
- mkdir -p $DIR_DLLS
-
- echo "${OPERATION} (${ARCH}): Extracting redistributable"
- cabextract -q -d $DIR_EXTRACTED -L $SOURCE_FILE
- cabextract -q -d $DIR_EXTRACTED_DLLS -L ${DIR_EXTRACTED}/*.cab
-
- # Grab the DLLs we need and correct naming
- echo "${OPERATION} (${ARCH}): Saving and renaming the correct DLLs"
- mv "${DIR_EXTRACTED_DLLS}/f_central_atl100_x86" "${DIR_DLLS}/atl100.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfc100_x86" "${DIR_DLLS}/mfc100.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfc100u_x86" "${DIR_DLLS}/mfc100u.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfcm100_x86" "${DIR_DLLS}/mfcm100.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfcm100u_x86" "${DIR_DLLS}/mfcm100u.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_msvcp100_x86" "${DIR_DLLS}/msvcp100.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_msvcr100_x86" "${DIR_DLLS}/msvcr100.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_vcomp100_x86" "${DIR_DLLS}/vcomp100.dll"
-
- # Clean-up
- echo "${OPERATION} (${ARCH}): Cleaning-up"
- rm -rf $DIR_EXTRACTED
- rm -rf $DIR_EXTRACTED_DLLS
- rm $SOURCE_FILE


- name: scripts
buildsystem: simple
Expand All @@ -45,23 +137,47 @@ modules:
- ' echo "No wine prefix set or is empty, abort."'
- ' exit 1'
- fi
- ''
-
- EXTENSION_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
- ''
- wine64 ${EXTENSION_DIR}/extra/vcrun2010_x64.exe /q
-
- mkdir -p "${WINEPREFIX}/dosdevices/c:/windows/system32/"
- cp ${EXTENSION_DIR}/extra/dlls/x64/*.dll "${WINEPREFIX}/dosdevices/c:/windows/system32/"
-
- for dll in ${EXTENSION_DIR}/extra/dlls/x64/*.dll
- do
- ' filename=${dll##*/}'
- ' name=${filename%.dll}'
-
- ' echo "[REGEDIT] Adding:"'
- ' echo "HKEY_CURRENT_USER\Software\Wine\DllOverrides"'
- ' echo "${name}=native,builtin"'
- ' wine64 reg add ''HKEY_CURRENT_USER\Software\Wine\DllOverrides'' /v ${name} /d native,builtin /f'
- done
- type: script
only-arches:
- x86_64
dest-filename: vcrun2010-install64-wow64
commands:
- if [ -z "$WINEPREFIX" ] ; then
- ' echo "No wine prefix set or is empty, abort."'
- ' "No wine prefix set or is empty, abort."'
- ' exit 1'
- fi
- ''
-
- EXTENSION_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
- ''
- wine ${EXTENSION_DIR}/extra/vcrun2010_x86.exe /q
-
- mkdir -p "${WINEPREFIX}/dosdevices/c:/windows/syswow64/"
- cp ${EXTENSION_DIR}/extra/dlls/x86/*.dll "${WINEPREFIX}/dosdevices/c:/windows/syswow64/"
-
- for dll in ${EXTENSION_DIR}/extra/dlls/x86/*.dll
- do
- ' filename=${dll##*/}'
- ' name=${filename%.dll}'
-
- ' echo "[REGEDIT] Adding:"'
- ' echo "HKEY_CURRENT_USER\Software\Wine\DllOverrides"'
- ' echo "${name}=native,builtin"'
- ' wine64 reg add ''HKEY_CURRENT_USER\Software\Wine\DllOverrides'' /v ${name} /d native,builtin /f'
- done
- type: script
only-arches:
- i386
Expand All @@ -71,10 +187,22 @@ modules:
- ' "No wine prefix set or is empty, abort."'
- ' exit 1'
- fi
- ''
-
- EXTENSION_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
- ''
- wine ${EXTENSION_DIR}/extra/vcrun2010_x86.exe /q
-
- mkdir -p "${WINEPREFIX}/dosdevices/c:/windows/system32/"
- cp ${EXTENSION_DIR}/extra/dlls/x86/*.dll "${WINEPREFIX}/dosdevices/c:/windows/system32/"
-
- for dll in ${EXTENSION_DIR}/extra/dlls/x86/*.dll
- do
- ' filename=${dll##*/}'
- ' name=${filename%.dll}'
-
- ' echo "[REGEDIT] Adding:"'
- ' echo "HKEY_CURRENT_USER\Software\Wine\DllOverrides"'
- ' echo "${name}=native,builtin"'
- ' wine reg add ''HKEY_CURRENT_USER\Software\Wine\DllOverrides'' /v ${name} /d native,builtin /f'
- done

- name: metainfo
buildsystem: simple
Expand Down
153 changes: 141 additions & 12 deletions extension/org.winepak.Platform.Extension.vcrun2012.yml
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ modules:
buildsystem: simple
build-commands:
- install -d ${FLATPAK_DEST}/bin
- install apply_extra* ${FLATPAK_DEST}/bin
- install apply_extra ${FLATPAK_DEST}/bin
sources:
# https://www.microsoft.com/en-nz/download/details.aspx?id=30679
- type: extra-data
Expand All @@ -23,13 +25,104 @@ modules:
url: https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe
size: 7186992
sha256: 681be3e5ba9fd3da02c09d7e565adfa078640ed66a0d58583efad2c1e3cc4064
filename: vcrun2012_x64.exe
filename: vc_redist.x64.exe
# https://www.microsoft.com/en-nz/download/details.aspx?id=30679
- type: extra-data
url: https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe
size: 6554576
sha256: b924ad8062eaf4e70437c8be50fa612162795ff0839479546ce907ffa8d6e386
filename: vcrun2012_x86.exe
filename: vc_redist.x86.exe
- type: script
only-arches:
- x86_64
dest-filename: apply_extra
commands:
- /app/bin/apply_extra64
- /app/bin/apply_extra32
-
- rm -rf extracted
- rm -rf extracted_dlls
- type: script
only-arches:
- i386
dest-filename: apply_extra
commands:
- /app/bin/apply_extra32
-
- rm -rf extracted
- rm -rf extracted_dlls
- type: script
only-arches:
- x86_64
dest-filename: apply_extra64
commands:
- OPERATION="vcrun2012"
- ARCH="x64"
- SOURCE_FILE="vc_redist.x64.exe"
- DIR_EXTRACTED="extracted/${ARCH}"
- DIR_EXTRACTED_DLLS="extracted_dlls/${ARCH}"
- DIR_DLLS="dlls/${ARCH}"
-
- mkdir -p $DIR_EXTRACTED
- mkdir -p $DIR_EXTRACTED_DLLS
- mkdir -p $DIR_DLLS
-
- echo "${OPERATION} (${ARCH}): Extracting redistributable"
- cabextract -q -d $DIR_EXTRACTED -L $SOURCE_FILE
- cabextract -q -d $DIR_EXTRACTED_DLLS -L ${DIR_EXTRACTED}/a2
- cabextract -q -d $DIR_EXTRACTED_DLLS -L ${DIR_EXTRACTED}/a3
-
- # Grab the DLLs we need and correct naming
- echo "${OPERATION} (${ARCH}): Saving and renaming the correct DLLs"
- mv "${DIR_EXTRACTED_DLLS}/f_central_atl110_x64" "${DIR_DLLS}/atl110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfc110_x64" "${DIR_DLLS}/mfc110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfc110u_x64" "${DIR_DLLS}/mfc110u.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_msvcp110_x64" "${DIR_DLLS}/msvcp110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_msvcr110_x64" "${DIR_DLLS}/msvcr110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_vcomp110_x64" "${DIR_DLLS}/vcomp110.dll"
-
- # Clean-up
- echo "${OPERATION} (${ARCH}): Cleaning-up"
- rm -rf $DIR_EXTRACTED
- rm -rf $DIR_EXTRACTED_DLLS
- rm $SOURCE_FILE
- type: script
dest-filename: apply_extra32
commands:
- OPERATION="vcrun2012"
- ARCH="x86"
- SOURCE_FILE="vc_redist.x86.exe"
- DIR_EXTRACTED="extracted/${ARCH}"
- DIR_EXTRACTED_DLLS="extracted_dlls/${ARCH}"
- DIR_DLLS="dlls/${ARCH}"
-
- mkdir -p $DIR_EXTRACTED
- mkdir -p $DIR_EXTRACTED_DLLS
- mkdir -p $DIR_DLLS
-
- echo "${OPERATION} (${ARCH}): Extracting redistributable"
- cabextract -q -d $DIR_EXTRACTED -L $SOURCE_FILE
- cabextract -q -d $DIR_EXTRACTED_DLLS -L ${DIR_EXTRACTED}/a2
- cabextract -q -d $DIR_EXTRACTED_DLLS -L ${DIR_EXTRACTED}/a3
-
- # Grab the DLLs we need and correct naming
- echo "${OPERATION} (${ARCH}): Saving and renaming the correct DLLs"
- mv "${DIR_EXTRACTED_DLLS}/f_central_atl110_x86" "${DIR_DLLS}/atl110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfc110_x86" "${DIR_DLLS}/mfc110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfc110u_x86" "${DIR_DLLS}/mfc110u.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfcm110_x86" "${DIR_DLLS}/mfcm110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_mfcm110u_x86" "${DIR_DLLS}/mfcm110u.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_msvcp110_x86" "${DIR_DLLS}/msvcp110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_msvcr110_x86" "${DIR_DLLS}/msvcr110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_vcamp110_x86" "${DIR_DLLS}/vcamp110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_vccorlib110_x86" "${DIR_DLLS}/vccorlib110.dll"
- mv "${DIR_EXTRACTED_DLLS}/f_central_vcomp110_x86" "${DIR_DLLS}/vcomp110.dll"
-
- # Clean-up
- echo "${OPERATION} (${ARCH}): Cleaning-up"
- rm -rf $DIR_EXTRACTED
- rm -rf $DIR_EXTRACTED_DLLS
- rm $SOURCE_FILE

- name: scripts
buildsystem: simple
Expand All @@ -45,23 +138,47 @@ modules:
- ' echo "No wine prefix set or is empty, abort."'
- ' exit 1'
- fi
- ''
-
- EXTENSION_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
- ''
- wine64 ${EXTENSION_DIR}/extra/vcrun2012_x64.exe /q
-
- mkdir -p "${WINEPREFIX}/dosdevices/c:/windows/system32/"
- cp ${EXTENSION_DIR}/extra/dlls/x64/*.dll "${WINEPREFIX}/dosdevices/c:/windows/system32/"
-
- for dll in ${EXTENSION_DIR}/extra/dlls/x64/*.dll
- do
- ' filename=${dll##*/}'
- ' name=${filename%.dll}'
-
- ' echo "[REGEDIT] Adding:"'
- ' echo "HKEY_CURRENT_USER\Software\Wine\DllOverrides"'
- ' echo "${name}=native,builtin"'
- ' wine64 reg add ''HKEY_CURRENT_USER\Software\Wine\DllOverrides'' /v ${name} /d native,builtin /f'
- done
- type: script
only-arches:
- x86_64
dest-filename: vcrun2012-install64-wow64
commands:
- if [ -z "$WINEPREFIX" ] ; then
- ' echo "No wine prefix set or is empty, abort."'
- ' "No wine prefix set or is empty, abort."'
- ' exit 1'
- fi
- ''
-
- EXTENSION_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
- ''
- wine ${EXTENSION_DIR}/extra/vcrun2012_x86.exe /q
-
- mkdir -p "${WINEPREFIX}/dosdevices/c:/windows/syswow64/"
- cp ${EXTENSION_DIR}/extra/dlls/x86/*.dll "${WINEPREFIX}/dosdevices/c:/windows/syswow64/"
-
- for dll in ${EXTENSION_DIR}/extra/dlls/x86/*.dll
- do
- ' filename=${dll##*/}'
- ' name=${filename%.dll}'
-
- ' echo "[REGEDIT] Adding:"'
- ' echo "HKEY_CURRENT_USER\Software\Wine\DllOverrides"'
- ' echo "${name}=native,builtin"'
- ' wine64 reg add ''HKEY_CURRENT_USER\Software\Wine\DllOverrides'' /v ${name} /d native,builtin /f'
- done
- type: script
only-arches:
- i386
Expand All @@ -71,10 +188,22 @@ modules:
- ' "No wine prefix set or is empty, abort."'
- ' exit 1'
- fi
- ''
-
- EXTENSION_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
- ''
- wine ${EXTENSION_DIR}/extra/vcrun2012_x86.exe /q
-
- mkdir -p "${WINEPREFIX}/dosdevices/c:/windows/system32/"
- cp ${EXTENSION_DIR}/extra/dlls/x86/*.dll "${WINEPREFIX}/dosdevices/c:/windows/system32/"
-
- for dll in ${EXTENSION_DIR}/extra/dlls/x86/*.dll
- do
- ' filename=${dll##*/}'
- ' name=${filename%.dll}'
-
- ' echo "[REGEDIT] Adding:"'
- ' echo "HKEY_CURRENT_USER\Software\Wine\DllOverrides"'
- ' echo "${name}=native,builtin"'
- ' wine reg add ''HKEY_CURRENT_USER\Software\Wine\DllOverrides'' /v ${name} /d native,builtin /f'
- done

- name: metainfo
buildsystem: simple
Expand Down