diff --git a/.DS_Store b/.DS_Store index 6713b84..c7d3b03 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/SPEx/conf/defaults.json b/SPEx/conf/defaults.json index 0d00d0d..a0da5f1 100644 --- a/SPEx/conf/defaults.json +++ b/SPEx/conf/defaults.json @@ -1,5 +1,5 @@ { - "version": "v1.41", + "version": "v1.42", "paths": { "lastUsed": "defaults.json", "configurationPath": "./conf/", diff --git a/SPEx/conf/linux.json b/SPEx/conf/linux.json index d3cff84..00ef358 100644 --- a/SPEx/conf/linux.json +++ b/SPEx/conf/linux.json @@ -1,5 +1,5 @@ { - "version": "v1.3", + "version": "v1.42", "paths": { "lastUsed": "linux.json", "configurationPath": "./conf/", diff --git a/SPEx/conf/loggerconf.json b/SPEx/conf/loggerconf.json index df9a712..90103a9 100644 --- a/SPEx/conf/loggerconf.json +++ b/SPEx/conf/loggerconf.json @@ -1,5 +1,5 @@ { - "logFile": "D:\\Test\\bananaSPLIT.log", + "logFile": "./SPEx.log", "logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s", "logTimeFormat": "%m-%d %H:%M:%S" } diff --git a/SPEx/scripts/create_SPEX.zsh b/SPEx/scripts/create_SPEX.zsh index 335e11c..a53c185 100755 --- a/SPEx/scripts/create_SPEX.zsh +++ b/SPEx/scripts/create_SPEX.zsh @@ -1,16 +1,25 @@ #!/bin/zsh +echo "Rimuovo i file precedenti" +rm -rf ../bin/* -pyinstaller --add-data="../.venv/lib/python3.8/site-packages/text_unidecode/data.bin":./text_unidecode \ - --icon="../spex/logo.ico" \ +pyinstaller --add-data="../.venv/lib/python3.7/site-packages/text_unidecode/data.bin":./text_unidecode \ + --icon="../spex/logo.icns" \ + --noconfirm \ --paths ./libbananasplit --paths ./UserInterface/compiledUI \ - --name=SPEx \ + --name=SPEx \ --onefile \ - --windowed -y \ + --windowed \ + --osx-bundle-identifier="12parsec.software.SPEx" \ ../spex/guimain.py echo "Copio configurazione" +cp -r ../conf ./dist/SPEx.app/Contents/MacOS/conf/ cp -r ../conf ./dist/ echo "Copio file binari" -mv ./dist/ ../bin +mv ./dist/ ../bin/ echo "Rinuovo cartella build" rm -rf ./build +echo "Firmo il codice" +cd ../bin/dist +#codesign --deep -s "12Parsec" SPEx.app +#codesign --deep -s "12Parsec" SPEx \ No newline at end of file diff --git a/SPEx/spex/guimain.py b/SPEx/spex/guimain.py index c108117..eb77933 100644 --- a/SPEx/spex/guimain.py +++ b/SPEx/spex/guimain.py @@ -622,8 +622,9 @@ if __name__ == '__main__': sys.excepthook = except_hook try: - print(f"Running directory {os.environ['WORKSPACELOC']}") - print(f"Pythonpath: {os.environ['PYTHONPATH']}") + #print(f"Running directory {os.environ['WORKSPACELOC']}") + #print(f"Pythonpath: {os.environ['PYTHONPATH']}") + print("LAUNCHDIR:", os.getcwd()) LOGGER = fancyLogger(filepath=r"./conf/loggerconf.json", fileLog=False) conf = bananaCONF(workdir=r"./conf", logger=LOGGER) conf.open()