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 or add missing premake workaround #88

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix or add missing premake workaround #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
992fb8c
Fix or add missing premake workaround
danielappelt Nov 16, 2020
2ab899f
Add check for existing premake installation
danielappelt Nov 16, 2020
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
20 changes: 12 additions & 8 deletions plugins-dep/package/camomile/01_workaround-missing-premake.patch
View file
Open in desktop
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`
20 changes: 12 additions & 8 deletions plugins/package/distrho-ports-labs/01_workaround-missing-premake.patch
View file
Open in desktop
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`
24 changes: 24 additions & 0 deletions plugins/package/mod-tal-noisemaker/01_workaround-missing-premake.patch
View file
Open in desktop
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`