Master dev

.dev/build/build-cloud.xml

@@ -69,7 +69,7 @@
         <chmod dir="${distrDir}" perm="a+w" type="both" />
         <echo message="Run release builder" />
         <exec executable="${sourceDir}/.dev/build/release/release.sh" dir="${buildDir}" failonerror="on">
-            <arg line="-c -l -b ${label} -d ${distrDir} -t" />
+            <arg line="-c -l -f ${sourceDir}/.dev/build/release/config.private.sh -b ${label} -d ${distrDir} -t" />
         </exec>
     </target>
 

.dev/build/release/changelog

@@ -0,0 +1,131 @@
+#!/usr/bin/env php
+<?php
+// vim: set ts=4 sw=4 sts=4 et:
+
+/**
+ * LiteCommerce
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to licensing@litecommerce.com so we can send you a copy immediately.
+ *
+ * PHP version 5.3.0
+ *
+ * @category  LiteCommerce
+ * @author    Creative Development LLC <info@cdev.ru>
+ * @copyright Copyright (c) 2012 Creative Development LLC <info@cdev.ru>. All rights reserved
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @link      http://www.litecommerce.com/
+ */
+
+define('IMPROVEMENTS', 0);
+define('FIXES', 1);
+define('OTHER', 2);
+
+echo generateChangelog($argv[1], $argv[2]);
+
+function generateChangelog($oldVersion, $newVersion)
+{
+    $changelog = shell_exec('git log --no-merges --date=iso --pretty=format:"%cd - %s (%an, %h)" -r '.$oldVersion.'..HEAD | sed "s/^\(.\{11\}\)\(.\{15\}\)/\1/"');
+    $changelog = correctChangelog($changelog);
+
+    return showChangelog($newVersion, $changelog);
+}
+
+function correctChangelog($text)
+{
+    $changelog = array (
+        IMPROVEMENTS => array(),
+        FIXES        => array(),
+        OTHER        => array(),
+    );
+
+    $lines = explode("\n", $text);
+
+    foreach ($lines as $line) {
+        $org_line = $line;
+        // Date
+        $date = '';
+        if (preg_match('/^([\d]{4,4}-[\d]{2,2}-[\d]{2,2}) - /', $line, $m)) {
+            $date = $m[1];
+            $line = trim(substr($line, strlen($m[0])));
+        }
+
+        // Source: ticket ID
+        $source = '';
+        while (preg_match('/^([\,\s]{0,2})(E|S{1,1}):(\d+)/', $line, $m)) {
+            $source .= ($source == '' ? ' ' : ', ') . $m[2] . ':' . ($m[2] == 'E' ? sprintf('%07d', $m[3]) : $m[3]);
+            $line = trim(substr($line, strlen($m[0])));
+        }
+
+        // Author and commit id
+        $author = '';
+        if (preg_match('/ \(([a-z- ]+), ([a-z0-9]{7,7})\)$/i', $line, $m)) {
+            $author = ' (' . $m[1] . ', ' . $m[2] . ')';
+            $line = trim(substr($line, 0, strlen($line) - strlen($m[0])));
+        }
+
+        // List of changes:
+        // it is assumed, that the comment may contain [+], [-], [*] or [!] several times
+        $changes = array();
+        $ar = preg_split('/(\[[\+|-|\!|\*]{1,1}\])/', $line, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        if (count($ar) > 1) {
+            for ($i=0; $i < count($ar); $i+=2) {
+                $changes[] = $ar[$i] . $ar[$i + 1];
+            }
+        } else {
+            $changes[] = $line;
+        }
+
+        foreach ($changes as $change) {
+            $index = substr($change, 0, 3) == '[!]'
+                     ? FIXES
+                     : (
+                         in_array(substr($change, 0, 3), array('[+]', '[-]', '[*]'))
+                         ? IMPROVEMENTS
+                         : OTHER
+                     );
+            // Replace
+            // [+] -> [New]
+            // [-] -> [Removal]
+            // [*] -> [Change]
+            // [!] -> [Bug]
+            $before = array('[+]', '[-]', '[*]', '[!]');
+            $after = array('[New]', '[Removal]', '[Change]', '[Bug]');
+            $change = str_replace($before, $after, $change);
+
+            // Place into changelog
+            $changelog[$index][] = $date . ' - ' . $change . $source . $author;
+        }
+    }
+
+    unset($lines);
+
+    return $changelog;
+}
+
+function showChangelog($version, $changelog)
+{
+    echo "## Version $version\n\n";
+
+    echo "### Improvements\n\n";
+    foreach ($changelog[IMPROVEMENTS] as $line) {
+        echo "* $line\n";
+    }
+
+    echo "\n\n### Fixes\n\n";
+    foreach ($changelog[FIXES] as $line) {
+        echo "* $line\n";
+    }
+
+    echo "\n\n### !!! UNKNOWN COMMITS !!!\n\n";
+    foreach ($changelog[OTHER] as $line) {
+        echo "* $line\n";
+    }
+}

.dev/build/release/config.demo.sh

@@ -2,7 +2,7 @@
 # Data definition for LiteCommerce release script
 #
 
-. config.sh
+. ./config.sh
 
 # Trigger to enable generation of demo version
 DEMO_VERSION="1"
@@ -29,6 +29,7 @@ CDev/AuthorizeNet
 CDev/Moneybookers
 CDev/Quantum
 CDev/PaypalWPS
+CDev/Paypal
 CDev/USPS
 "
 
@@ -64,3 +65,7 @@ LC_SEO_PHRASES=""
 
 DRUPAL_SEO_PHRASES=""
 
+REPLACE_HEADERS_SETTINGS=""
+
+CHECK_HEADERS_SETTINGS=""
+

.dev/build/release/config.sh

@@ -39,6 +39,19 @@ CLEAR_OUTPUT_DIR=1
 LITECOMMERCE_DIRNAME="litecommerce"
 DRUPAL_DIRNAME="drupal"
 
+# These parameters are used as as part of distributive package file name
+LITECOMMERCE_DISTR_NAME="litecommerce3"
+LITECOMMERCE_CORE_DISTR_NAME="lc-core"
+
+# Title of LiteCommerce (used only in progress messages)
+LITECOMMERCE_TITLE="LiteCommerce"
+
+# Set this to non-empty value if you need generate lc_connector module and lc3_clean theme
+PACK_DRUPAL_MODULES=""
+
+# Set this to empty value if you don't want  to generate ECMS package
+BUILD_DRUPAL_PACKAGE="Y"
+
 # LiteCommerce modules for including to the distributives
 XLITE_MODULES="
 CDev/Bestsellers
@@ -49,24 +62,31 @@ CDev/ProductOptions
 
 # LiteCommerce modules which should be packed as separate distributives
 XLITE_SEPARATE_MODULES="
+CDev/AmazonS3Images
 CDev/AustraliaPost
 CDev/AuthorizeNet
 CDev/Bestsellers
+CDev/Catalog
+CDev/ContactUs
 CDev/DrupalConnector
 CDev/FeaturedProducts
 CDev/FileAttachments
 CDev/GoogleAnalytics
 CDev/GoSocial
 CDev/MarketPrice
 CDev/Moneybookers
+CDev/Paypal
 CDev/PaypalWPS
 CDev/ProductOptions
 CDev/Quantum
 CDev/SalesTax
 CDev/Sale
+CDev/SocialLogin
+CDev/SimpleCMS
 CDev/TinyMCE
 CDev/TwoCheckout
 CDev/VAT
+CDev/UserPermissions
 CDev/USPS
 CDev/XMLSitemap
 CDev/XMLSitemapDrupal
@@ -133,7 +153,7 @@ Powered by LiteCommerce [shopping cart software]
 Powered by LiteCommerce [PHP shopping cart]
 Powered by LiteCommerce [PHP shopping cart system]
 Powered by LiteCommerce [eCommerce shopping cart]
-Powered by LiteCommerce [online shopping cart] 
+Powered by LiteCommerce [online shopping cart]
 Powered by LiteCommerce [eCommerce software]
 Powered by LiteCommerce [eCommerce software]
 Powered by LiteCommerce [e-commerce software]
@@ -164,4 +184,7 @@ Powered by LiteCommerce [e-commerce software] and Drupal CMS
 Powered by LiteCommerce [e-commerce solution] and Drupal CMS
 "
 
+REPLACE_HEADERS_SETTINGS=""
+
+CHECK_HEADERS_SETTINGS="./files/headers/settings.lc3.php"
 

.dev/build/release/files/headers/filter.lc3.txt

@@ -0,0 +1,17 @@
+DrupalConnector
+GoogleAnalytics
+XMLSitemapDrupal
+Module/CDev/AmazonS3Images/lib
+Module/CDev/ContactUs/recaptcha/recaptchalib.php
+Includes/Decorator/Plugin/Doctrine/Utils/ModelGenerator
+skins/common/js/jquery
+skins/common/js/php.js
+skins/common/js/ui
+skins/common/js/validationEngine
+skins/common/js/cloud-zoom.min.js
+skins/common/css
+skins/common/colorpicker
+skins/default/en/css/jq
+skins/default/en/common/ui.datepicker.css
+skins/admin/en/modules/CDev/TinyMCE/js/tinymce
+

.dev/build/release/files/headers/header.gpl.css.txt

@@ -0,0 +1,10 @@
+/* vim: set ts=2 sw=2 sts=2 et: */
+
+/**
+ * %commentplaceholder%
+ *
+ * @author    Creative Development LLC <info@cdev.ru>
+ * @copyright Copyright (c) %yearplaceholder% Creative Development LLC <info@cdev.ru>. All rights reserved
+ * @license   http://www.gnu.org/licenses/gpl-2.0.html GNU General Pubic License (GPL 2.0)
+ * @link      http://www.litecommerce.com/
+ */

.dev/build/release/files/headers/header.gpl.php.txt

@@ -0,0 +1,24 @@
+<?php
+// vim: set ts=4 sw=4 sts=4 et:
+
+/**
+ * LiteCommerce
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the GNU General Pubic License (GPL 2.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to licensing@litecommerce.com so we can send you a copy immediately.
+ *
+ * PHP version 5.3.0
+ *
+ * @category  LiteCommerce
+ * @author    Creative Development LLC <info@cdev.ru>
+ * @copyright Copyright (c) %yearplaceholder% Creative Development LLC <info@cdev.ru>. All rights reserved
+ * @license   http://www.gnu.org/licenses/gpl-2.0.html GNU General Pubic License (GPL 2.0)
+ * @link      http://www.litecommerce.com/
+ */

.dev/build/release/files/headers/header.gpl.tpl.txt

@@ -0,0 +1,10 @@
+{* vim: set ts=2 sw=2 sts=2 et: *}
+
+{**
+ * %commentplaceholder%
+ *
+ * @author    Creative Development LLC <info@cdev.ru>
+ * @copyright Copyright (c) %yearplaceholder% Creative Development LLC <info@cdev.ru>. All rights reserved
+ * @license   http://www.gnu.org/licenses/gpl-2.0.html GNU General Pubic License (GPL 2.0)
+ * @link      http://www.litecommerce.com/
+ *}

.dev/build/release/files/headers/header.gpl.yaml.txt

@@ -0,0 +1,8 @@
+# vim: set ts=2 sw=2 sts=2 et:
+#
+# %commentplaceholder%
+#
+# @author    Creative Development LLC <info@cdev.ru>
+# @copyright Copyright (c) %yearplaceholder% Creative Development LLC <info@cdev.ru>. All rights reserved
+# @license   http://www.gnu.org/licenses/gpl-2.0.html GNU General Pubic License (GPL 2.0)
+# @link      http://www.litecommerce.com/

.dev/build/release/files/headers/header.osl.css.txt

@@ -0,0 +1,10 @@
+/* vim: set ts=2 sw=2 sts=2 et: */
+
+/**
+ * %commentplaceholder%
+ *
+ * @author    Creative Development LLC <info@cdev.ru>
+ * @copyright Copyright (c) %yearplaceholder% Creative Development LLC <info@cdev.ru>. All rights reserved
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @link      http://www.litecommerce.com/
+ */

.dev/build/release/files/headers/header.osl.php.txt

@@ -0,0 +1,24 @@
+<?php
+// vim: set ts=4 sw=4 sts=4 et:
+
+/**
+ * LiteCommerce
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to licensing@litecommerce.com so we can send you a copy immediately.
+ *
+ * PHP version 5.3.0
+ *
+ * @category  LiteCommerce
+ * @author    Creative Development LLC <info@cdev.ru>
+ * @copyright Copyright (c) %yearplaceholder% Creative Development LLC <info@cdev.ru>. All rights reserved
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @link      http://www.litecommerce.com/
+ */

.dev/build/release/files/headers/header.osl.tpl.txt

@@ -0,0 +1,10 @@
+{* vim: set ts=2 sw=2 sts=2 et: *}
+
+{**
+ * %commentplaceholder%
+ *
+ * @author    Creative Development LLC <info@cdev.ru>
+ * @copyright Copyright (c) %yearplaceholder% Creative Development LLC <info@cdev.ru>. All rights reserved
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @link      http://www.litecommerce.com/
+ *}

.dev/build/release/files/headers/header.osl.yaml.txt

@@ -0,0 +1,8 @@
+# vim: set ts=2 sw=2 sts=2 et:
+#
+# %commentplaceholder%
+#
+# @author    Creative Development LLC <info@cdev.ru>
+# @copyright Copyright (c) %yearplaceholder% Creative Development LLC <info@cdev.ru>. All rights reserved
+# @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+# @link      http://www.litecommerce.com/

.dev/build/release/files/headers/header.xcn.css.txt

@@ -0,0 +1,10 @@
+/* vim: set ts=2 sw=2 sts=2 et: */
+
+/**
+ * %commentplaceholder%
+ *
+ * @author    Qualiteam software Ltd <info@x-cart.com>
+ * @copyright Copyright (c) %yearplaceholder% Qualiteam software Ltd <info@x-cart.com>. All rights reserved
+ * @license   http://next.x-cart.com/software-license-agreement.html X-Cart Next License Agreement
+ * @link      http://www.x-cart.com/
+ */