Trying to fix builder script (versions) (3.0.0-rc5)

bin/build

@@ -31,7 +31,7 @@ foreach ($argv as $arg) {
 
 $base = dirname(__DIR__);
 if (false === $hasVersion) {
-    $file = fopen("{$base}/CHANGELOG.md", 'rb');
+    $file = fopen("{$base}/CHANGELOG.md",'rb');
     if (preg_match('/^# (\d\.\d+.\d+(-[a-z0-9.]+)?)\s*$/i', fgets($file), $matches) !== 1) {
         echo 'First line of CHANGELOG.md has wrong Gantry version format, aborting';
         return 1;
@@ -52,14 +52,13 @@ if (false === $hasVersion) {
         $version .= '-' . $commitShort;
 
         $argv[] = '-Dstr.fileversion=_' . $branch;
-        if (!empty($commit)) {
-            $argv[] = '-Dcommit=' . $commit;
-        }
+        $argv[] = '-Dcommit=' . $commit;
     }
+
+    $argv[] = '-Dxml.version=' . $version;
 }
 
 $command = 'vendor/bin/phing ' . implode(' ', $argv);
-echo "Running command: {$command}\n";
 if (false === system($command, $result) || $result) {
     throw new \RuntimeException('Failed to run build script');
 }

bin/builder/build.xml

@@ -49,10 +49,10 @@
     <property name="path.src" value="${project_dir}/src" />
     <property name="path.themes" value="${project_dir}/themes" />
     <tstamp>
-        <format property="str.datefmt" pattern="MMMM d, yyyy" locale="en"/>
+        <format property="str.datefmt" pattern="${cfg.datefmt}" />
     </tstamp>
     <tstamp>
-        <format property="str.datexml" pattern="MMMM d, yyyy" locale="en"/>
+        <format property="str.datexml" pattern="${cfg.date}" />
     </tstamp>
     <property name="version.date" value="${str.datexml}" />
 
@@ -239,4 +239,4 @@
     <target name="wordpress-prod" depends="preflight,info,mkdir,wordpress,cleanup,postflight" />
     <target name="grav-prod" depends="preflight,info,mkdir,grav,cleanup,postflight" />
 
-</project>
+</project>