marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Übernahme woanders erstellter Änderungen

Browse Source
This commit is contained in:
marko
2018-06-25 20:09:57 +02:00
parent da8db3324b
commit d9ee5aea30
63 changed files with 4223 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
homepage/redesign2018/markdownExperiment/Makefile
View File

@@ -3,13 +3,14 @@ RES_LIST = 64 128 256 512
cssFiles = $(wildcard css/*.css)
mdFiles = $(wildcard md/*.md)
phpFiles = $(patsubst md/%.md, build/%.php, $(mdFiles))
ampFiles = $(patsubst md/%.md, build/amp/%.php, $(mdFiles))
phpLibFiles = $(wildcard phpLib/cwsvJudo/*.php) phpLib/phpcount/phpcount.php
configFiles = $(wildcard config/*.php)
ampFiles = $(patsubst md/%.md, build/amp/%.php, $(mdFiles))
uploadMarker = \
$(patsubst build/%.php, build/.uploadMarker/%.php, $(phpFiles)) \
$(patsubst build/amp/%.php, build/.uploadMarker/amp/%.php, $(ampFiles)) \
$(patsubst phpLib/%.php, build/.uploadMarker/phpLib/%.php, $(phpLibFiles)) \
$(patsubst config/%.php, build/.uploadMarker/config/%.php, $(configFiles)) \
build/.uploadMarker/config/.htaccess \
@@ -27,9 +28,15 @@ clean:
.PHONY: echo
echo:
@echo "phpFiles:"
@echo $(phpFiles)
@echo "ampFiles:"
@echo $(ampFiles)
@echo "phpLibFiles:"
@echo $(phpLibFiles)
@echo "cssFiles:"
@echo $(cssFiles)
@echo "uploadMarker:"
@echo $(uploadMarker)
@@ -37,8 +44,9 @@ echo:
ampTest: $(ampFiles)
build/css/cwsvJudo.css: $(cssFiles)
mkdir -p build/css
cat $(cssFiles) > $@
mkdir -p $(dir $@)
# cat $(cssFiles) > $@
cat $^ | csso -o $@
# cat $(cssFiles) | cleancss -o $@
build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate
@@ -58,13 +66,9 @@ build/amp/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pandocTem
--template=pandocTemplate/cwsvJudo.amp.pandocTemplate \
--output=$@ \
$< $(word 2,$^)
curl \
--upload-file $@ \
--user cwsvjudo:***REMOVED*** \
ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs
touch $@
# Die auskommentierte Variante fand ich besser, aber der Validator hat ein Problem mit http bei src in img ;)
# sed --in-place 's/<img \(.*\)\/>/<amp-img \1 layout=\"responsive\"><noscript><img \1\/><\/noscript><\/amp-img>/g;' $@
sed --in-place 's/<img \(.*\)\/>/<amp-img \1 layout=\"responsive\"><\/amp-img>/g;' $@
build/yaml/%.yaml: yaml/images.yaml yaml/navTargets.yaml yaml/mainNav.yaml yaml/%.subNav.yaml
mkdir -p build/yaml
@@ -87,6 +91,22 @@ build/.uploadMarker/%.php: build/%.php
--ftp-create-dirs
touch $@
build/.uploadMarker/amp/%.php: build/amp/%.php
mkdir -p build/.uploadMarker/amp
# @toDo: das wenn die Entwicklung des ampParts fertig ist auf das
# Zielverzeichnis pages/amp umstellen
curl \
--upload-file $^ \
--user cwsvjudo:Dee4oquu \
ftp://cwsvjudo.square7.net/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \
--ftp-create-dirs
curl \
--upload-file $^ \
--user cwsvjudo:***REMOVED*** \
ftp://cwsvjudo.bplaced.net/www/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \
--ftp-create-dirs
touch $@
build/.uploadMarker/phpLib/%.php: phpLib/%.php
mkdir -p build/.uploadMarker/phpLib/cwsvJudo
mkdir -p build/.uploadMarker/phpLib/phpcount