Skip to content

Some build cleanup I did when I was trying to get things working. I'm not sure about kitchensink/dist instead of kitchensink/app. I'll ask about that in an issue. #10

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.

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ fi
BUILDID=`date +%Y%m%d`

shopt -s extglob
mkdir "$BUILDDIR"
mkdir -p "$BUILDDIR"

# Make sure STAGEDIR exists
if [ ! -d "$STAGEDIR" ]; then mkdir -p "$STAGEDIR"; fi
Expand Down
4 changes: 2 additions & 2 deletions config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ DEFAULT_VERSION_PREFIX="0.0.0.SOURCE."
VERSION_NUMERIC="0.0.0"

# Directory for building
BUILDDIR="/tmp/app-build-`uuidgen | head -c 8`"
BUILDDIR="$CALLDIR/out/app-build-`uuidgen | head -c 8`"
# Module to use as XUL app for build
MODULE="app"
# Module containing webapp to wrap
WEBAPPMODULE="kitchensink/app/"
WEBAPPMODULE="kitchensink/dist"
Copy link
Member

Choose a reason for hiding this comment

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

This particular line was already changed in https://github.com/Taytay/webapp-xul-wrapper/commit/70b55b60a3e7fae84d670fdb92a596b7e429fa6c
Could you change it to the exact same line, or revert this line change, so that merge conflicts are avoided?
Thanks

# Directory containing privileged scripts to be copied to the application's chrome contents
BRIDGESCRIPTS="kitchensink/bridge/"
# Directory for unpacked binaries
Expand Down
Empty file modified run-kitchensink.sh
100644 → 100755
Empty file.