Updated to 1.2.2, with Pyblish Tray

pyblish · Nov 5, 2015 · f3b818e · f3b818e
1 parent f69610d
commit f3b818e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,11 @@
 pyblish-win CHANGELOG
 ======================
 
+Version 1.2.2
+-------------
+
+- Updated to Pyblish X 0.2.0
+
 Version 1.2.1
 -------------
 

diff --git a/bin/pyblish-tray.bat b/bin/pyblish-tray.bat
@@ -0,0 +1,2 @@
+@echo off
+"%~dp0pythonw" "%~dp0_launcher.py" "%~dp0\" pyblish_tray %*
diff --git a/lib/pyblish-x b/lib/pyblish-x
diff --git a/pyblish_win/version.py b/pyblish_win/version.py
@@ -1,7 +1,7 @@
 
 VERSION_MAJOR = 1
 VERSION_MINOR = 2
-VERSION_PATCH = 1
+VERSION_PATCH = 2
 
 version_info = (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
 version = '%i.%i.%i' % version_info

diff --git a/pythonpath/pyblish_tray/__init__.py b/pythonpath/pyblish_tray/__init__.py
@@ -0,0 +1,5 @@
+import os
+import imp
+
+util = imp.load_source("_util", os.path.join(__file__, "..", "..", "_util.py"))
+util.wrap_module(__name__.replace("_", "-"))
diff --git a/setup.iss b/setup.iss
@@ -57,7 +57,7 @@ Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "HIERO_PLUGIN
 Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "HOUDINI_PATH"; ValueData: "&;{#HoudiniIntegration};{olddata}"; Components: houdini
 
 [Icons]
-Name: "{group}\Pyblish"; Filename: "{app}\bin\pyblish-standalone.bat"; WorkingDir: "{app}"; IconFilename: "{app}\icon.ico"
+Name: "{group}\Pyblish"; Filename: "{app}\bin\pyblish-tray.bat"; WorkingDir: "{app}"; IconFilename: "{app}\icon.ico"
 Name: "{group}\Pyblish Interpreter"; Filename: "{app}\bin\python.bat"; WorkingDir: "{userdocs}"; IconFilename: "{app}\icon.ico"
 Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@echo off
		"%~dp0pythonw" "%~dp0_launcher.py" "%~dp0\" pyblish_tray %*