Skip to content

Commit

Permalink
Fixes to create-dist.py
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanislas Polu committed Oct 21, 2014
1 parent 3f81ed8 commit 702b98b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ npm-debug.log

src/common/chrome_version.h
dummy_session

dist
4 changes: 1 addition & 3 deletions NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
/******************************************************************************/

>>v0.x<<
:package
- Proper package scripts

:webview
- Webview support

Expand All @@ -26,6 +23,7 @@ DONE:
>>v0.7.2<<
- Fix Menu not working Ubuntu #193
- Windows support
- Distribution creation scripts

>>v0.7.1<<
- Drop Unix Domain Socket in favor of stdin/stout API
Expand Down
14 changes: 7 additions & 7 deletions scripts/create-dist.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
safe_mkdir, execute


THRUST_SHELL_VERSION = get_thrust_shell_version()
THRUST_SHELL_VERSION = get_thrust_version()

SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
Expand All @@ -30,7 +30,7 @@
'darwin': [
],
'win32': [
'atom.exe',
'thrust_shell.exe',
'chromiumcontent.dll',
'content_shell.pak',
'd3dcompiler_43.dll',
Expand All @@ -46,7 +46,7 @@
'xinput1_3.dll',
],
'linux': [
'atom',
'thrust_shell',
'content_shell.pak',
'icudtl.dat',
'libchromiumcontent.so',
Expand All @@ -55,14 +55,14 @@
}
TARGET_DIRECTORIES = {
'darwin': [
'Atom.app',
'ThrustShell.app',
],
'win32': [
'resources',
'locales',
],
'linux': [
'resources',
# 'resources',
'locales',
],
}
Expand Down Expand Up @@ -115,7 +115,7 @@ def parse_args():


def force_build():
build = os.path.join(SOURCE_ROOT, 'script', 'build.py')
build = os.path.join(SOURCE_ROOT, 'scripts', 'build.py')
execute([sys.executable, build, '-c', 'Release'])


Expand All @@ -135,7 +135,7 @@ def copy_license():


def copy_system_libraries():
ldd = execute(['ldd', os.path.join(OUT_DIR, 'thrust')])
ldd = execute(['ldd', os.path.join(OUT_DIR, 'thrust_shell')])
lib_re = re.compile('\t(.*) => (.+) \(.*\)$')
for line in ldd.splitlines():
m = lib_re.match(line)
Expand Down

0 comments on commit 702b98b

Please sign in to comment.