From 8154fb27f7156116d39e3658a0b9abeb9d502c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Tue, 9 Jun 2020 18:03:06 +0200 Subject: wdyt about Makefiles? --- Makefile | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 Makefile (limited to 'Makefile') diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..141eca1 --- /dev/null +++ b/Makefile @@ -0,0 +1,39 @@ +default: + @echo "*** BežiApp Makefile ***" + @echo "targets:" + @echo " make prepare installs dependencies, cleans after itself, requires sudo permissions and debian/ubuntu for apt" + @echo " make install installs BežiApp to dist/" + @echo "no target specified, exiting ..." + +prepare: + #!/bin/bash + sudo apt install git + mkdir tmp + cd tmp + rm -rf bverbose + git clone https://github.com/sijanec/bverbose + cd bverbose + make prepare + make install + mv bin ../../bin + cd .. + rm -rf bverbose + cd .. + +install: + #!/bin/bash + ./bin/bvr-compose-html assets/pages-src/ dist/pages/ .html + cp -r assets/css dist/ + cp -r assets/fonts dist/ + cp -r assets/img dist/ + find assets/root/ -type f \( ! -name "*.bvr" \) -exec cp -r "{}" dist/ \; + find assets/root/ -name "*.bvr" -printf "%f\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/\${FILE/.bvr/}"; ./bin/bvr-compose-single \"assets/root/\$FILE\" \"\$FILE_DST\"" + + # js bvr fajli + mkdir -p dist/js + # js ne znam te magije + find assets/js/ -name "*.bvr" -printf "%f\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/js/\${FILE/.bvr/}"; ./bin/bvr-compose-single \"assets/js/\$FILE\" \"\$FILE_DST\"" + find assets/js/ -name "*.js" -printf "%P\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/js/\${FILE/.bvr/}"; ./bin/bvr-jsmin assets/js/\"\$FILE\" \"\$FILE_DST\"" + + cp -r assets/root/.well-known dist/ + -- cgit v1.2.3 From f4c921fdfbae7845996128d0994be32760ffc977 Mon Sep 17 00:00:00 2001 From: sijanec Date: Tue, 9 Jun 2020 18:06:11 +0200 Subject: Makefile patches --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 141eca1..63d9cc0 100644 --- a/Makefile +++ b/Makefile @@ -7,15 +7,15 @@ default: prepare: #!/bin/bash - sudo apt install git - mkdir tmp + sudo apt install git -y + mkdir -p tmp cd tmp rm -rf bverbose git clone https://github.com/sijanec/bverbose cd bverbose make prepare make install - mv bin ../../bin + mv bin/* ../../bin/ cd .. rm -rf bverbose cd .. -- cgit v1.2.3 From 855d322a78e4575e34500ba0b093f716b8631c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Tue, 9 Jun 2020 18:34:50 +0200 Subject: makefile is NOT WORKING! --- Makefile | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 63d9cc0..1a32f02 100644 --- a/Makefile +++ b/Makefile @@ -9,31 +9,24 @@ prepare: #!/bin/bash sudo apt install git -y mkdir -p tmp - cd tmp - rm -rf bverbose - git clone https://github.com/sijanec/bverbose - cd bverbose - make prepare - make install - mv bin/* ../../bin/ - cd .. - rm -rf bverbose - cd .. + rm -rf tmp/bverbose + cd tmp && git clone https://github.com/sijanec/bverbose && cd bverbose && \ + make prepare && make install + mv tmp/bverbose/bin/* bin/ + rm -rf tmp/bverbose -install: +generate: #!/bin/bash ./bin/bvr-compose-html assets/pages-src/ dist/pages/ .html cp -r assets/css dist/ cp -r assets/fonts dist/ cp -r assets/img dist/ find assets/root/ -type f \( ! -name "*.bvr" \) -exec cp -r "{}" dist/ \; - find assets/root/ -name "*.bvr" -printf "%f\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/\${FILE/.bvr/}"; ./bin/bvr-compose-single \"assets/root/\$FILE\" \"\$FILE_DST\"" - + -find assets/root/ -name "*.bvr" -printf "%f\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/\$${FILE/.bvr/}"; ./bin/bvr-compose-single \"assets/root/\$$FILE\" \"\$$FILE_DST\"" # js bvr fajli mkdir -p dist/js # js ne znam te magije - find assets/js/ -name "*.bvr" -printf "%f\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/js/\${FILE/.bvr/}"; ./bin/bvr-compose-single \"assets/js/\$FILE\" \"\$FILE_DST\"" - find assets/js/ -name "*.js" -printf "%P\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/js/\${FILE/.bvr/}"; ./bin/bvr-jsmin assets/js/\"\$FILE\" \"\$FILE_DST\"" - + -find assets/js/ -name "*.bvr" -printf "%f\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/js/\$${FILE/.bvr/}"; ./bin/bvr-compose-single \"assets/js/\$$FILE\" \"\$$FILE_DST\"" + -find assets/js/ -name "*.js" -printf "%P\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/js/\$${FILE/.bvr/}"; ./bin/bvr-jsmin assets/js/\"\$$FILE\" \"\$$FILE_DST\"" cp -r assets/root/.well-known dist/ -- cgit v1.2.3 From 4cb2560ef806194ab31a7bb7deb0d4606b0d89b2 Mon Sep 17 00:00:00 2001 From: sijanec Date: Tue, 9 Jun 2020 19:13:54 +0200 Subject: fixed help screens and notices for make generate != make install --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1a32f02..911ebc9 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ default: @echo "*** BežiApp Makefile ***" @echo "targets:" @echo " make prepare installs dependencies, cleans after itself, requires sudo permissions and debian/ubuntu for apt" - @echo " make install installs BežiApp to dist/" + @echo " make generate installs BežiApp to dist/" @echo "no target specified, exiting ..." prepare: -- cgit v1.2.3