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

Use latest release from beginning #16

Closed
wants to merge 1 commit into from
Closed

Use latest release from beginning #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions aseprite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Script to automate building latest release of Aseprite (it can be release or beta build)
# This is for macOS build version.

POSTFIXPATH_SDKROOT=Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk
POSTFIXPATH_SDKROOT=Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be fine to use the current installed SDK, rather than requiring an old one...

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm skeptical about this as it relates to #11 , I think we should not touch this for now.

CCPATH_TOOLCHAIN=Toolchains/XcodeDefault.xctoolchain/usr/bin/cc
CXXPATH_TOOLCHAIN=Toolchains/XcodeDefault.xctoolchain/usr/bin/c++
SDK_ROOT=`xcode-select -p`
Expand Down Expand Up @@ -69,8 +69,8 @@ fi
# change to aseprite directory
cd aseprite

# checkout master branch
git checkout master
# checkout the latest tag (release or beta)
git checkout `git describe --tags`

# clear the current dirty state of git repository
git reset --hard
Expand Down Expand Up @@ -123,7 +123,7 @@ export PATH="${PWD}/depot_tools:${PATH}"
cd skia

# get proper skia's branch to compile
SKIA_BRANCH=$(curl "https://raw.githubusercontent.com/aseprite/aseprite/master/INSTALL.md" | grep "aseprite-m[0-9][0-9]" | sed -n '1p' | perl -n -e '/(aseprite-m\d\d)/ && print $1')
SKIA_BRANCH=$(curl "https://raw.githubusercontent.com/aseprite/aseprite/main/INSTALL.md" | grep "aseprite-m[0-9][0-9]" | sed -n '1p' | perl -n -e '/(aseprite-m\d\d)/ && print $1')
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is arguably still wrong, since it's not using the tag. I think it's probably okay for now.

Copy link
Owner

@haxpor haxpor Nov 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. This one is good. aseprite really changes the structure of branches included separation of release and beta version.

Edit:
Yeah, I kinda agree, it's ideal to base on specific tag to parse the content from.

git checkout $SKIA_BRANCH

python tools/git-sync-deps
Expand Down