Changeset 2558:31f1ca134823

Timestamp:

11/15/13 16:39:24 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

2.6

Children:

2559:2901695f9a58, 2560:4ce25b2f2f5f

Message:

Improve Makefile to removed unnecessayery files and directories (tests, _dist, ...)

File:

• Makefile (modified) (6 diffs)

Makefile

@@ +1 @@
+.PHONY: config-stamp
+
 SHELL=/bin/sh
-
 DIST=_dist
 DC=$(DIST)/dotclear
@@ -7 +8 @@
      @echo "make config or make dist"
 
-config:
+config: clean config-stamp
      mkdir -p ./$(DC)
 
      ## Copy needed folders and files
-     cp -pRf ./admin ./inc ./themes ./index.php ./CHANGELOG ./CREDITS ./LICENSE ./README.md ./CONTRIBUTING.md ./$(DC)/
+     cp -pRf ./admin ./inc ./index.php ./CHANGELOG ./CREDITS ./LICENSE ./README.md ./CONTRIBUTING.md ./$(DC)/
 
      ## Locales directory
@@ -17 +18 @@
      cp -pRf ./locales/README ./locales/en ./locales/fr ./$(DC)/locales/
 
+     ## Remove tests directories and test stuff
+     rm -fr ./$(DC)/inc/libs/clearbricks/tests ./$(DC)/inc/libs/clearbricks/composer.* \
+            ./$(DC)/inc/libs/clearbricks/.atoum.* ./$(DC)/inc/libs/clearbricks/vendor \
+            ./$(DC)/inc/libs/clearbricks/bin ./$(DC)/inc/libs/clearbricks/_dist
+
      ## Create cache, db, plugins and public folders
-     mkdir ./$(DC)/cache ./$(DC)/db ./$(DC)/plugins ./$(DC)/public
-     cp inc/.htaccess ./$(DC)/cache/
-     cp inc/.htaccess ./$(DC)/db/
-     cp inc/.htaccess ./$(DC)/plugins/
-
-     ## Remove .svn folders
-     find ./$(DIST)/ -type d -name '.svn' | xargs rm -rf
-
-     ## Remove .hg* files and folders
-     find ./$(DIST)/ -type d -name '.hg*' | xargs rm -rf
-     find ./$(DIST)/ -type f -name '.hg*' | xargs rm -rf
+     mkdir ./$(DC)/cache ./$(DC)/db ./$(DC)/plugins ./$(DC)/public ./$(DC)/themes
+     cp -p inc/.htaccess ./$(DC)/cache/
+     cp -p inc/.htaccess ./$(DC)/db/
+     cp -p inc/.htaccess ./$(DC)/plugins/
 
      ## Remove config file if any
      rm -f ./$(DC)/inc/config.php
+
+     ## Copy built-in themes
+     cp -pRf \
+     ./themes/default \
+     ./themes/blueSilence \
+     ./themes/customCSS \
+     ./themes/ductile \
+     ./$(DC)/themes/
 
      ## Copy built-in plugins
@@ -54 +61 @@
      ./$(DC)/plugins/
 
-     ## Remove .svn folders
-     find ./$(DIST)/ -type d -name '.svn' -print0 | xargs -0 rm -rf
-
-     ## Remove .hg* files and folders
-     find ./$(DIST)/ -type d -name '.hg*' | xargs rm -rf
-     find ./$(DIST)/ -type f -name '.hg*' | xargs rm -rf
-
      ## "Compile" .po files
      ./build-tools/make-l10n.php ./$(DC)/
@@ -75 +75 @@
      ## Debug off
      perl -pi -e "s|^//\*== DC_DEBUG|/*== DC_DEBUG|sgi;" $(DC)/inc/prepend.php $(DC)/inc/prepend.php
+
+     ## Remove scm files and folders from DC and CB
+     find ./$(DIST)/ -type d -name '.svn' | xargs -r rm -rf
+     find ./$(DIST)/ -type d -name '.hg'  | xargs -r rm -rf
+     find ./$(DIST)/ -type d -name '.git' | xargs -r rm -rf
+     find ./$(DIST)/ -type f -name '.*ignore' | xargs -r rm -rf
 
      ## Create digest
@@ -117 +123 @@
 
 clean:
-     [ -f config-stamp ]
-     rm -rf $(DIST)
-     rm -f config-stamp build-stamp configure-stamp
+     rm -rf $(DIST) config-stamp