Skip to content
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
20 changes: 12 additions & 8 deletions plugins-dep/package/camomile/01_workaround-missing-premake.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
diff --git a/scripts/premake-update.sh b/premake-update.sh
index 5290d5a..6db0525 100755
diff --git a/scripts/premake-update.sh b/scripts/premake-update.sh
index 5290d5a..56fdde5 100755
--- a/scripts/premake-update.sh
+++ b/scripts/premake-update.sh
@@ -26,9 +26,14 @@ if [ -d ../libs ]; then
@@ -26,9 +26,18 @@ if [ -d ../libs ]; then
cd ..
fi

+if [ ! -f premake ]; then
+ wget https://github.com/kunitoki/juced/raw/master/tools/linux/premake; chmod +x premake

+if ! which premake > /dev/null; then
+ if [ ! -f premake ]; then
+ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp
+ fi
+ PREMAKE=$(pwd)/premake
+else
+ PREMAKE=premake
+fi
+PREMAKE=$(pwd)/premake
+
run_premake()
{
- premake --os $1 --target gnu --cc gcc
+ $PREMAKE --os $1 --target gnu --cc gcc

if [ $MAC == 1 ]; then
sed -i -e "s|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS) \$(TARGET_ARCH)|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS)|" `find . -name \*.make`
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
diff --git a/scripts/premake-update.sh b/premake-update.sh
index 5290d5a..6db0525 100755
diff --git a/scripts/premake-update.sh b/scripts/premake-update.sh
index 5290d5a..56fdde5 100755
--- a/scripts/premake-update.sh
+++ b/scripts/premake-update.sh
@@ -26,9 +26,14 @@ if [ -d ../libs ]; then
@@ -26,9 +26,18 @@ if [ -d ../libs ]; then
cd ..
fi

+if [ ! -f premake ]; then
+ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp

+if ! which premake > /dev/null; then
+ if [ ! -f premake ]; then
+ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp
+ fi
+ PREMAKE=$(pwd)/premake
+else
+ PREMAKE=premake
+fi
+PREMAKE=$(pwd)/premake
+
run_premake()
{
- premake --os $1 --target gnu --cc gcc
+ $PREMAKE --os $1 --target gnu --cc gcc

if [ $MAC == 1 ]; then
sed -i -e "s|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS) \$(TARGET_ARCH)|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS)|" `find . -name \*.make`
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/scripts/premake-update.sh b/scripts/premake-update.sh
index 5290d5a..56fdde5 100755
--- a/scripts/premake-update.sh
+++ b/scripts/premake-update.sh
@@ -26,9 +26,18 @@ if [ -d ../libs ]; then
cd ..
fi

+if ! which premake > /dev/null; then
+ if [ ! -f premake ]; then
+ mkdir tmp; cd tmp && wget --quiet http://archive.ubuntu.com/ubuntu/pool/universe/p/premake/premake_3.7-1_amd64.deb && dpkg -x premake_3.7-1_amd64.deb . && mv ./usr/bin/premake ../ && cd .. && rm -rf tmp
+ fi
+ PREMAKE=$(pwd)/premake
+else
+ PREMAKE=premake
+fi
+
run_premake()
{
- premake --os $1 --target gnu --cc gcc
+ $PREMAKE --os $1 --target gnu --cc gcc

if [ $MAC == 1 ]; then
sed -i -e "s|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS) \$(TARGET_ARCH)|BLDCMD = ar -rcs \$(OUTDIR)/\$(TARGET) \$(OBJECTS)|" `find . -name \*.make`