Merge branch 'tulinkry-opengrok-tools-readme'

Vladimir Kotal · Vladimir Kotal · commit c1e38f7b1315 · 2018-10-27T19:44:56.000+02:00
diff --git a/opengrok-tools/.gitignore b/opengrok-tools/.gitignore
@@ -1 +1,3 @@
 opengrok_tools.egg-info
+.eggs
+env
diff --git a/opengrok-tools/MANIFEST.in b/opengrok-tools/MANIFEST.in
@@ -1 +1 @@
-include src/main/python/README.md
+include README.md
diff --git a/opengrok-tools/README.md b/opengrok-tools/README.md
diff --git a/opengrok-tools/pom.xml b/opengrok-tools/pom.xml
@@ -103,6 +103,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <cfraire@me.com>.
                                     <directory>${basedir}</directory>
                                     <includes>
                                         <include>MANIFEST.in</include>
+                                        <include>README.md</include>
                                         <include>logging.properties.template</include>
                                     </includes>
                                 </resource>
diff --git a/opengrok-tools/requirements.txt b/opengrok-tools/requirements.txt
diff --git a/opengrok-tools/setup.py b/opengrok-tools/setup.py
@@ -7,8 +7,7 @@
 
 
 def readme():
-    with open(os.path.join(SCRIPT_DIR, 'src', 'main', 'python', 'README.md'),
-              'r') as readme:
+    with open(os.path.join(SCRIPT_DIR, 'README.md'), 'r') as readme:
         return readme.read()
 
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include src/main/python/README.md`
	`1`	`+include README.md`