Load version number from file

diff --git a/.gitignore b/.gitignore
index c1e6936f700767edd449f683babef7af18f059f3..2458a03212539e3b1b41f30d7d17eaefc97edd1a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /README.html
 /dist
 /bin/phar-php-sqllint.php
 /README.html
 /dist
 /bin/phar-php-sqllint.php

+VERSION

diff --git a/README.rst b/README.rst
index e02ff6bac8b22f91d0efabdc651db85d668f470f..d4ae83c2c487d6dd10dc7fc4357bf50688f30348 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -96,8 +96,7 @@ Building
 
 Preparation
 ===========
 
 Preparation
 ===========

-- Adjust version number in ``src/phpsqllint/Cli.php``
-- Adjust version number in ``build.xml``
+1. Write new version number into ``VERSION``

 
 
 Create the release
 
 
 Create the release

diff --git a/build.xml b/build.xml
index 9585aa158e6d0bc2d24629f1fb2fe814c1d7234b..4d1b07ed1a0bc9e08bb426500068a77c017e277d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="php-sqllint" default="phar" basedir=".">
 
 <?xml version="1.0" encoding="utf-8"?>
 <project name="php-sqllint" default="phar" basedir=".">
 

- <property name="version"  value="0.0.2" />
+ <property name="version"  value="dev" />
+ <loadfile property="version" file="VERSION">
+  <filterchain>
+   <striplinebreaks />
+  </filterchain>
+ </loadfile>
+

  <property name="pharfile" value="${phing.dir}/dist/${phing.project.name}-${version}.phar" />
  <property name="pharfilebz2" value="${phing.dir}/dist/${phing.project.name}-${version}.bz2.phar" />
  <property name="libdir" value="${phing.dir}/lib"/>
  <property name="pharfile" value="${phing.dir}/dist/${phing.project.name}-${version}.phar" />
  <property name="pharfilebz2" value="${phing.dir}/dist/${phing.project.name}-${version}.bz2.phar" />
  <property name="libdir" value="${phing.dir}/lib"/>


@@ -12,6 +18,7 @@
   <include name="src/**"/>
 
   <include name="README.rst"/>
   <include name="src/**"/>
 
   <include name="README.rst"/>

+  <include name="VERSION"/>

 
   <include name="vendor/autoload.php"/>
   <include name="vendor/composer/*.php"/>
 
   <include name="vendor/autoload.php"/>
   <include name="vendor/composer/*.php"/>

diff --git a/src/phpsqllint/Cli.php b/src/phpsqllint/Cli.php
index 1448a53e649d12fe919968af90689ea91c1eb818..4edcf666c777db965c544c1840aa0967f28150b8 100644 (file)
--- a/src/phpsqllint/Cli.php
+++ b/src/phpsqllint/Cli.php
@@ -163,9 +163,14 @@ class Cli
     {
         $parser = new \Console_CommandLine();
         $parser->description = 'php-sqllint';
     {
         $parser = new \Console_CommandLine();
         $parser->description = 'php-sqllint';

-        $parser->version = '0.0.2';
+        $parser->version = 'dev';

         $parser->avoid_reading_stdin = true;
 
         $parser->avoid_reading_stdin = true;
 

+        $versionFile = __DIR__ . '/../../VERSION';
+        if (file_exists($versionFile)) {
+            $parser->version = trim(file_get_contents($versionFile));
+        }
+

         $parser->addOption(
             'format',
             array(
         $parser->addOption(
             'format',
             array(