Skip to content

Commit

Permalink
no launcher for now
Browse files Browse the repository at this point in the history
  • Loading branch information
archibate committed Sep 29, 2021
1 parent c17cf57 commit 3d94511
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 13 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (MSVC)
endif()

option(ZENO_BUILD_TESTS "Build tests for ZENO" OFF)
option(ZENO_BUILD_LAUNCHER "Build ZENO wrapper launcher" OFF)
#option(ZENO_BUILD_LAUNCHER "Build ZENO wrapper launcher" OFF)
option(ZENO_BUILD_EXTENSIONS "Build extension modules for ZENO" ON)
option(ZENO_GLOBALSTATE "Enable ZENO frame and substep support" ON)
option(ZENO_VISUALIZATION "Enable ZENO visualization support" ON)
Expand Down Expand Up @@ -77,6 +77,6 @@ if (ZENO_BUILD_TESTS)
add_subdirectory(tests)
endif()

if (ZENO_BUILD_LAUNCHER)
add_subdirectory(scripts/launcher)
endif()
#if (ZENO_BUILD_LAUNCHER)
# add_subdirectory(scripts/launcher)
#endif()
23 changes: 15 additions & 8 deletions dist.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

print('==> release version={} os_name={}'.format(version, os_name))

print('==> copying launcher wrapper')
if os_name == 'linux':
shutil.copyfile('zenqt/bin/launcher', 'dist/launcher')
elif os_name == 'windows':
shutil.copyfile('zenqt/bin/launcher.exe', 'dist/launcher.exe')
#print('==> copying launcher wrapper')
#if os_name == 'linux':
# shutil.copyfile('zenqt/bin/launcher', 'dist/launcher')
#elif os_name == 'windows':
# shutil.copyfile('zenqt/bin/launcher.exe', 'dist/launcher.exe')

if os_name == 'linux':
print('==> copying linux shared libraries')
Expand All @@ -34,12 +34,19 @@
print('==> invoking pyinstaller for packaging')
subprocess.check_call([sys.executable, '-m', 'PyInstaller', 'scripts/{}.spec'.format(os_name), '-y'] + sys.argv[1:])

print('==> moving launcher wrapper')
#print('==> moving launcher wrapper')
#if os_name == 'linux':
# shutil.move('dist/launcher', 'dist/zenqte/launcher')
# os.system('chmod +x dist/zenqte/launcher')
#elif os_name == 'windows':
# shutil.move('dist/launcher.exe', 'dist/zenqte/launcher.exe')

print('==> moving zenqte launcher')
if os_name == 'linux':
shutil.move('dist/launcher', 'dist/zenqte/launcher')
shutil.move('dist/zenqte/zenqte', 'dist/zenqte/launcher')
os.system('chmod +x dist/zenqte/launcher')
elif os_name == 'windows':
shutil.move('dist/launcher.exe', 'dist/zenqte/launcher.exe')
shutil.move('dist/zenqte/zenqte.exe', 'dist/zenqte/launcher.exe')

#print('==> appending version informations')
#with open('dist/zenqte/zenqt/__init__.py', 'a') as f:
Expand Down
1 change: 0 additions & 1 deletion scripts/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

args = [
'--clean',
'--build-launcher',
'--with-openvdb',
'--with-bullet',
'--with-cgal',
Expand Down

0 comments on commit 3d94511

Please sign in to comment.