Merge branch 'master' into opengrok-tools-readme

Author: Vladimir Kotal

distribution/assembly.xml

@@ -22,7 +22,12 @@
       <file>
         <source>${project.basedir}/../opengrok-tools/${project.build.directory}/dist/opengrok-tools-${project.python.package.version}.tar.gz</source>
         <outputDirectory>tools</outputDirectory>
-        <destName>opengrok-tools-${project.python.package.version}.tar.gz</destName>
+        <destName>opengrok-tools.tar.gz</destName>
+      </file>
+      <file>
+        <source>${project.basedir}/../opengrok-tools/${project.build.directory}/dist/logging.properties.template</source>
+        <outputDirectory>doc</outputDirectory>
+        <destName>logging.properties.template</destName>
       </file>
     </files>
     <fileSets>

opengrok-tools/pom.xml

@@ -91,7 +91,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
                         </configuration>
                     </execution>
                     <execution>
-                        <id>copy-resources-setup.py</id>
+                        <id>copy package resources</id>
                         <phase>compile</phase>
                         <goals>
                             <goal>copy-resources</goal>
@@ -104,6 +104,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
                                     <includes>
                                         <include>MANIFEST.in</include>
                                         <include>README.md</include>
+                                        <include>logging.properties.template</include>
                                     </includes>
                                 </resource>
                                 <!-- replace ${project.python.package.version} in setup.py -->
@@ -117,6 +118,24 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy logging.properties.template to dist</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/dist</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}</directory>
+                                    <includes>
+                                        <include>logging.properties.template</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

opengrok-tools/setup.py

@@ -18,12 +18,23 @@ def my_test_suite():
     return test_suite
 
 
+def get_version(version):
+    """
+    Detect the mvn build versus the local python setup.py install run.
+    :param version: the new version string to be applied
+    :return: the mvn version, or local version number
+    """
+    if 'project.python.package.version' in version:
+        return '0.0.1local'
+    return version
+
+
 setup(
     name='opengrok-tools',
     # The package version is taken from maven.
     # this "variable" is replaced by maven on the fly so don't change it here
     # see pom.xml for this module
-    version='${project.python.package.version}',
+    version=get_version('${project.python.package.version}'),
     packages=[
         'opengrok_tools',
         'opengrok_tools.utils',