Merge pull request #608 from virtualtam/refactor/bookmark-parser

Reference netscape-bookmark-parser & allow generating custom release archives

diff --git a/.gitignore b/.gitignore
index 75cd3a6b842a264e9b2423c8391a7ddaa090fc9a..095aaded26909ee9583bfe12130b72993625379a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# Ignore data/, tmp/, cache/ and pagecache/
+# Shaarli runtime resources
 data
 tmp
 cache
@@ -9,18 +9,22 @@ pagecache
 .buildpath
 .project
 
-# Ignore raintpl generated pages
+# Raintpl generated pages
 *.rtpl.php
 
-# Ignore test dependencies
+# 3rd-party dependencies
 composer.lock
-/vendor/
+vendor/
 
-# Ignore development and test resources
+# Release archives
+*.tar
+*.zip
+
+# Development and test resources
 coverage
 doxygen
 sandbox
 phpmd.html
 
-# Ignore user plugin configuration
+# User plugin configuration
 plugins/*/config.php

diff --git a/Makefile b/Makefile
index 52d200908e6c3a52190f5a1345b72723de7540d8..22be0d96c36875614958ccd481f1f00bc20bd8fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # The personal, minimalist, super-fast, database free, bookmarking service.
-# Makefile for PHP code analysis & testing
+# Makefile for PHP code analysis & testing, documentation and release generation
 
 # Prerequisites:
 # - install Composer, either:
@@ -127,6 +127,34 @@ test:
        @mkdir -p sandbox
        @$(BIN)/phpunit tests
 
+##
+# Custom release archive generation
+#
+# For each tagged revision, GitHub provides tar and zip archives that correspond
+# to the output of git-archive
+#
+# These targets produce similar archives, featuring 3rd-party dependencies
+# to ease deployment on shared hosting.
+##
+ARCHIVE_VERSION := shaarli-$$(git describe)-full
+
+release_archive: release_tar release_zip
+
+### download 3rd-party PHP libraries
+composer_dependencies: clean
+       composer update --no-dev
+       find vendor/ -name ".git" -type d -exec rm -rf {} +
+
+### generate a release tarball and include 3rd-party dependencies
+release_tar: composer_dependencies
+       git archive -o $(ARCHIVE_VERSION).tar HEAD
+       tar rvf $(ARCHIVE_VERSION).tar vendor/
+
+### generate a release zip and include 3rd-party dependencies
+release_zip: composer_dependencies
+       git archive -o $(ARCHIVE_VERSION).zip -9 HEAD
+       zip -r $(ARCHIVE_VERSION).zip vendor/
+
 ##
 # Targets for repository and documentation maintenance
 ##

diff --git a/composer.json b/composer.json
index e419dc1193fb85236db0f40b6ab5befb1e0b0d6b..dc1b509e530a73cc542c574de8705dff406ce0a8 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -9,8 +9,15 @@
         "wiki": "https://github.com/shaarli/Shaarli/wiki"
     },
     "keywords": ["bookmark", "link", "share", "web"],
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/shaarli/netscape-bookmark-parser"
+        }
+    ],
     "require": {
-        "php": ">=5.3.4"
+        "php": ">=5.3.4",
+        "kafene/netscape-bookmark-parser": "dev-shaarli-stable"
     },
     "require-dev": {
         "phpmd/phpmd" : "@stable",