Skip to content

Commit 496810c

Browse files
committed
Replaced 7zip with built-in tar command.
1 parent d9cb052 commit 496810c

File tree

3 files changed

+5
-367
lines changed

3 files changed

+5
-367
lines changed

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ If updating from a previous version of Aseprite make sure you delete the previou
1515

1616
## Dependencies
1717

18-
* [7-Zip](https://7-zip.org/) (64-bit recommended)
18+
* [Tar] (Should be bundled with recent releases of Windows 10 and newer)
1919
* The latest version of [Cmake](https://cmake.org) (3.14 or greater)
2020
* [Curl](https://curl.se/) (Should be bundled with recent releases of Windows 10 and newer)
2121
* [Ninja](https://ninja-build.org/) build system
@@ -57,11 +57,7 @@ The user customizable portion of this script consists of paths. Most of these pa
5757

5858
* This path is to check if the correct version of the Windows SDK is installed, modify if INSTALL.MD recommends a newer SDK version.
5959

60-
8. ZIP
61-
62-
* Path to 7-Zip, alternate commented code if using the 32-bit version of 7-Zip.
63-
64-
9. TEMP
60+
8. TEMP
6561

6662
* Path to temporary directory for curls.
6763

@@ -76,7 +72,7 @@ Aseprite source code and a pre-built copy of Skia are curled into the temp direc
7672
The script will then begin the build process based on instructions from [INSTALL.md](https://github.com/aseprite/aseprite/blob/main/INSTALL.md).
7773

7874
Upon completion the script will output a DIR command displaying the newly compiled aseprite.exe located in the
79-
%ASEPRITE%\build\bin directory. You can freely copy the executable and data folder located in the %ASEPRITE%\build\bin directory to a new location of your choosing.
75+
%ASEPRITE%\build\bin directory. You can freely copy the executable and data folder located in the previously mentioned bin directory to a new location of your choosing.
8076

8177
Enjoy using Aseprite!
8278

aseprite-build-script.bat

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,12 @@ set VISUALSTUDIO="C:\Program Files\Microsoft Visual Studio\2022\Community"
2323

2424
set WINSDK="C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.UniversalCRT.Debug\10.0.20348.0"
2525

26-
set ZIP="C:\Program Files\7-Zip"
27-
:: set ZIP="C:\Program Files (x86)\7-Zip"
28-
2926
set TEMP=C:\Temp
3027

3128
:: EVERYTHING AFTER THIS POINT SHOULD BE AUTOMATED, DO NOT MODIFY UNLESS SOMETHING IS BROKEN!!!
3229

3330
:: Dependencies check
3431

35-
echo Checking for 7-Zip...
36-
if exist %ZIP%\7z.exe (
37-
echo 7-Zip was found!
38-
)
39-
if not exist %ZIP%\7z.exe (
40-
echo 7-Zip was not found
41-
echo Do you have the correct version uncommented?
42-
echo Do you have the correct installation drive set?
43-
exit /b 1
44-
)
45-
4632
echo Checking for ninja...
4733
where /q ninja
4834
if ERRORLEVEL 1 (
@@ -127,7 +113,7 @@ if not exist %ASEPRITE%\NUL (
127113
curl %ASEZIP% -L -o %TEMP%\asesrc.zip
128114
echo Unzipping to %ASEPRITE%...
129115
md %ASEPRITE%
130-
%ZIP%\7z.exe x %TEMP%\asesrc.zip -o%ASEPRITE% -y
116+
tar -xf %TEMP%\asesrc.zip -C %ASEPRITE%
131117
)
132118
if ERRORLEVEL 1 (
133119
echo Aseprite failed to download and extract
@@ -152,7 +138,7 @@ if not exist %SKIA%\NUL (
152138
curl %SKIAZIP% -L -o %TEMP%\skia.zip
153139
echo Unzipping to %SKIA%...
154140
md %SKIA%
155-
%ZIP%\7z.exe x %TEMP%\skia.zip -o%SKIA% -y
141+
tar -xf %TEMP%\skia.zip -C %SKIA%
156142
)
157143
if ERRORLEVEL 1 (
158144
echo Skia failed to download and extract

0 commit comments

Comments
 (0)