Moved source code into src

xltrail · May 23, 2018 · f4e5b10 · f4e5b10
1 parent 192a791
commit f4e5b10
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -23,17 +23,17 @@ install:
 
 build_script:
   - C:\Python36\python .\scripts\windows\update-version-info.py
-  - C:\Python36\Scripts\pyinstaller --onefile .\diff.py --name git-xltrail-diff-x86.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\xltrail-core.dll;.
+  - C:\Python36\Scripts\pyinstaller --onefile .\src\diff.py --name git-xltrail-diff-x86.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\src\xltrail-core.dll;.
   - mv dist\git-xltrail-diff-x86.exe git-xltrail-diff-x86.exe
-  - C:\Python36-x64\Scripts\pyinstaller --onefile .\diff.py --name git-xltrail-diff-x64.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\xltrail-core.dll;.
+  - C:\Python36-x64\Scripts\pyinstaller --onefile .\src\diff.py --name git-xltrail-diff-x64.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\src\xltrail-core.dll;.
   - mv dist\git-xltrail-diff-x64.exe git-xltrail-diff-x64.exe
-  - C:\Python36\Scripts\pyinstaller --onefile .\merge.py --name git-xltrail-merge-x86.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\xltrail-core.dll;.
+  - C:\Python36\Scripts\pyinstaller --onefile .\src\merge.py --name git-xltrail-merge-x86.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\src\xltrail-core.dll;.
   - mv dist\git-xltrail-merge-x86.exe git-xltrail-merge-x86.exe
-  - C:\Python36-x64\Scripts\pyinstaller --onefile .\merge.py --name git-xltrail-merge-x64.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\xltrail-core.dll;.
+  - C:\Python36-x64\Scripts\pyinstaller --onefile .\src\merge.py --name git-xltrail-merge-x64.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\src\xltrail-core.dll;.
   - mv dist\git-xltrail-merge-x64.exe git-xltrail-merge-x64.exe
-  - C:\Python36\Scripts\pyinstaller --onefile .\cli.py --name git-xltrail-x86.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\xltrail-core.dll;.
+  - C:\Python36\Scripts\pyinstaller --onefile .\src\cli.py --name git-xltrail-x86.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\src\xltrail-core.dll;.
   - mv dist\git-xltrail-x86.exe git-xltrail-x86.exe
-  - C:\Python36-x64\Scripts\pyinstaller --onefile .\cli.py --name git-xltrail-x64.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\xltrail-core.dll;.
+  - C:\Python36-x64\Scripts\pyinstaller --onefile .\src\cli.py --name git-xltrail-x64.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\src\xltrail-core.dll;.
   - mv dist\git-xltrail-x64.exe git-xltrail-x64.exe
 
 after_build:
@@ -47,8 +47,8 @@ after_build:
   - cmd: signtool sign /f scripts/windows/key.p12 /p %secure% git-xltrail-windows*.exe
 
 test_script:
-  - C:\Python36\python -m unittest discover -vv
-  - C:\Python36-x64\python -m unittest discover -vv
+  - C:\Python36\python -m unittest discover src -vv
+  - C:\Python36-x64\python -m unittest discover src -vv
 
 
 artifacts:

diff --git a/scripts/windows/build.bat b/scripts/windows/build.bat
@@ -4,6 +4,6 @@ set /p PYTHON_ARCH= < PYTHON_ARCH
 del PYTHON_ARCH
 
 python .\scripts\windows\update-version-info.py
-pyinstaller --onefile .\diff.py --name=git-xltrail-diff-%PYTHON_ARCH%.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\xltrail-core.dll;.
-pyinstaller --onefile .\merge.py --name=git-xltrail-merge-%PYTHON_ARCH%.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\xltrail-core.dll;.
-pyinstaller --onefile .\cli.py --name=git-xltrail-%PYTHON_ARCH%.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\xltrail-core.dll;.
+pyinstaller --onefile .\src\diff.py --name=git-xltrail-diff-%PYTHON_ARCH%.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\src\xltrail-core.dll;.
+pyinstaller --onefile .\src\merge.py --name=git-xltrail-merge-%PYTHON_ARCH%.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\src\xltrail-core.dll;.
+pyinstaller --onefile .\src\cli.py --name=git-xltrail-%PYTHON_ARCH%.exe --version-file .\scripts\windows\git-xltrail-version-info.py --icon .\scripts\windows\git-xltrail-logo.ico --add-data .\src\xltrail-core.dll;.
diff --git a/scripts/windows/update-version-info.py b/scripts/windows/update-version-info.py
@@ -55,7 +55,7 @@
     f.write(s)
 
 # update git-xltrail.py (VERSION and COMMIT)
-path = 'cli.py'
+path = 'src\\cli.py'
 with open(path, 'r') as f:
     s = f.read()
 

diff --git a/cli.py → src/cli.py b/cli.py → src/cli.py
@@ -2,6 +2,7 @@
 import sys
 import os
 import fnmatch
+import argparse
 import subprocess
 import clr
 import colorama

diff --git a/diff.py → src/diff.py b/diff.py → src/diff.py
diff --git a/merge.py → src/merge.py b/merge.py → src/merge.py
diff --git a/tests/Book1.xlsb → src/tests/Book1.xlsb b/tests/Book1.xlsb → src/tests/Book1.xlsb
diff --git a/tests/__init__.py → src/tests/__init__.py b/tests/__init__.py → src/tests/__init__.py
diff --git a/tests/test_cli.py → src/tests/test_cli.py b/tests/test_cli.py → src/tests/test_cli.py
diff --git a/tests/test_diff.py → src/tests/test_diff.py b/tests/test_diff.py → src/tests/test_diff.py
diff --git a/xltrail-core.dll → src/xltrail-core.dll b/xltrail-core.dll → src/xltrail-core.dll