changes

[uguu.git] / Makefile

diff --git a/Makefile b/Makefile
index 18b06d6bd8c8a8a97a1a0f8d9bb5e6a95c79c45e..f044aac5b7f181963eeea75ca1768549a2a1f9a2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,14 @@ GREP="grep"
 NODE="node"
 NPM="npm"
 NODEJQ="node_modules/node-jq/bin/jq"
-CONF="dist.json"
+SQLITE="sqlite3"
+CONF="src/config.json"
+PHP="php"
+CURL="curl"
 DESTDIR = $(shell $(CURDIR)/$(NODEJQ) -r ".dest" $(CURDIR)/$(CONF))
 NPX="npx"
 PKG_VERSION = $(shell $(CURDIR)/$(NODEJQ) -r ".version" $(CURDIR)/package.json)
-TMPDIR := $(shell mktemp -d)
+TMPDIR = $(shell mktemp -d)
 DOCKER_IMAGE = "$(shell basename $(CURDIR) | tr [:upper:] [:lower:])"
 DOCKER_TAG="$(DOCKER_TAG)"
 CONTAINER_NAME="$(CONTAINER_NAME)"
@@ -19,49 +22,47 @@ MODULES="php"
 pageList = $(shell $(CURDIR)/$(NODEJQ) -r ".pages[]" $(CURDIR)/$(CONF))
 noExt = $(shell echo $(i) | cut -d '.' -f1)
 
-all: builddirs npm_dependencies ejs minify-all copy-img submodules
+all: builddirs npm_dependencies composer ejs minify-all copy-img copy-php
 
 ejs:
        $(foreach i,$(pageList), \
-       $(NPX) ejs -f $(CURDIR)/$(CONF) $(CURDIR)/templates/$(i) -o $(CURDIR)/build/tmp/html/$(noExt).html;)
+       $(NPX) ejs -f $(CURDIR)/$(CONF) $(CURDIR)/src/templates/$(i) -o $(CURDIR)/build/html/unmin/$(noExt).html;)
 
 minify-all:
-       $(NPX) minify-all-cli -s $(CURDIR)/build/tmp/html/ -d $(CURDIR)/build/html
-       $(NPX) minify-all-cli -s $(CURDIR)/static/js -d $(CURDIR)/build/js
-       $(NPX) minify-all-cli -s $(CURDIR)/static/css -d $(CURDIR)/build/css
+       $(NPX) minify-all-cli -s $(CURDIR)/src/static/js -d $(CURDIR)/build/js
+       $(NPX) minify-all-cli -s $(CURDIR)/src/static/css -d $(CURDIR)/build/css
+       $(NPX) minify-all-cli -s $(CURDIR)/build/html/unmin/ -d $(CURDIR)/build/html/min/ -h
 
 installdirs:
        mkdir -p $(DESTDIR)/ $(DESTDIR)/img
        mkdir -p $(DESTDIR)/ $(DESTDIR)/img/grills
-ifneq (,$(findstring php,$(MODULES)))
-       mkdir -p $(DESTDIR)/includes
-endif
-ifneq (,$(findstring moe,$(MODULES)))
-       mkdir -p $(DESTDIR)/moe/{css,fonts,includes,js,login,panel/css/font,panel/css/images,register,templates}
-endif
 
 copy-img:
-       cp -v $(CURDIR)/static/img/*.png $(CURDIR)/build/img/
-       cp -R $(CURDIR)/static/img/grills $(CURDIR)/build/img/
+       $(NPX) imagemin $(CURDIR)/src/static/img/*.png -o=$(CURDIR)/build/img/
+       $(NPX) imagemin $(CURDIR)/src/static/img/grills/*.png --plugin=pngquant -o=$(CURDIR)/build/img/grills/
 
 copy-php:
-ifneq ($(wildcard $(CURDIR)/static/php/.),)
-       cp -rv $(CURDIR)/static/php/* $(CURDIR)/build/
-else
-       $(error The php submodule was not found)
-endif
+       cp -v $(CURDIR)/src/static/php/*.php $(CURDIR)/build/php/
+       cp -v $(CURDIR)/src/Classes/*.php $(CURDIR)/build/php/classes/
 
 install: installdirs
        cp -rv $(CURDIR)/build/* $(DESTDIR)/
-       mv $(DESTDIR)/html/* $(DESTDIR)/
-       mv $(DESTDIR)/js/* $(DESTDIR)/
-       mv $(DESTDIR)/css/* $(DESTDIR)/
+       cp -rv $(CURDIR)/vendor $(DESTDIR)/
+       cp $(CURDIR)/src/config.json $(DESTDIR)/
+       mv $(DESTDIR)/html/min/* $(DESTDIR)/public/
+       mv $(DESTDIR)/js/* $(DESTDIR)/public/
+       mv $(DESTDIR)/css/* $(DESTDIR)/public/
+       mv $(DESTDIR)/php/* $(DESTDIR)/
        rm -rf $(DESTDIR)/html
        rm -rf $(DESTDIR)/css
        rm -rf $(DESTDIR)/js
-       rm -rf $(DESTDIR)/tmp
-       mv $(DESTDIR)/uguu.css $(DESTDIR)/uguu.min.css
-       mv $(DESTDIR)/app.js $(DESTDIR)/uguu.min.js
+       rm -rf $(DESTDIR)/php
+       mv $(DESTDIR)/public/uguu.css $(DESTDIR)/public/uguu.min.css
+       mv $(DESTDIR)/public/uguu.js $(DESTDIR)/public/uguu.min.js
+       mv $(DESTDIR)/img $(DESTDIR)/public/
+       mv $(DESTDIR)/grill.php $(DESTDIR)/public/
+       mv $(DESTDIR)/upload.php $(DESTDIR)/public/
+
 dist:
        DESTDIR=$(TMPDIR)/uguu-$(PKGVERSION)
        export DESTDIR
@@ -69,22 +70,33 @@ dist:
        $(TAR) cJf uguu-$(PKG_VERSION).tar.xz $(DESTDIR)
        rm -rf $(TMPDIR)
        
+
 clean:
        rm -rvf $(CURDIR)/node_modules 
        rm -rvf $(CURDIR)/build
        
+
 uninstall:
        rm -rvf $(DESTDIR)/
        
+
 npm_dependencies:
        $(NPM) install
 
+composer:
+       $(CURL) -o composer-setup.php https://raw.githubusercontent.com/composer/getcomposer.org/main/web/installer
+       $(PHP) composer-setup.php --quiet
+       rm composer-setup.php
+       php composer.phar update
+       php composer.phar install
 
 build-image:
+               tar --exclude='./uguuForDocker.tar.gz' --exclude='./vendor' --exclude='./node_modules' -czf uguuForDocker.tar.gz .
+               mv uguuForDocker.tar.gz docker/
                docker build -f docker/Dockerfile --build-arg VERSION=$(UGUU_RELEASE_VER) --no-cache -t $(DOCKER_IMAGE):$(DOCKER_TAG) .
 
 run-container:
-                docker run --name $(CONTAINER_NAME) -d -p 8080:80 -p 8081:443 --env-file docker/.env $(DOCKER_IMAGE):$(DOCKER_TAG)
+                docker run --name $(CONTAINER_NAME) -d -p 8080:80 -p 8081:443 $(DOCKER_IMAGE):$(DOCKER_TAG)
 
 purge-container:
        if docker images | grep $(DOCKER_IMAGE); then \
@@ -92,19 +104,5 @@ purge-container:
        fi;             
 
 builddirs:
-       mkdir -p $(CURDIR)/build $(CURDIR)/build/img $(CURDIR)/build/tmp $(CURDIR)/build/tmp/html
-ifneq (,$(findstring php,$(MODULES)))
-       mkdir -p $(CURDIR)/build/classes $(CURDIR)/build/includes
-endif
-ifneq (,$(findstring moe,$(MODULES)))
-       mkdir -p $(CURDIR)/build/moe/{css,fonts,includes,js,login,panel/css/font,panel/css/images,register,templates}
-endif
-
-submodules:
-       $(info The following modules will be enabled: $(MODULES))
-ifneq (,$(findstring php,$(MODULES)))
-       $(MAKE) copy-php
-endif
-ifneq (,$(findstring moe,$(MODULES)))
-       $(MAKE) copy-moe
-endif
+       mkdir -p $(CURDIR)/build $(CURDIR)/build/img $(CURDIR)/build/html $(CURDIR)/build/html/min $(CURDIR)/build/html/unmin $(CURDIR)/build/js $(CURDIR)/build/css $(CURDIR)/build/php $(CURDIR)/build/php/classes $(CURDIR)/build/public
+