Changeset 928

Timestamp:

12/20/07 04:40:57 (1 year ago)

Author:

glslang

Message:

+ build fixes

Location:

trunk

Files:

• installer/jahplayer.nsi (modified) (1 diff)
• jahplayer/footer.py (modified) (2 diffs)
• jahplayer/jahplayer.cpp (modified) (2 diffs)
• jahplayer/jahplayer_vc8.vcproj (modified) (2 diffs)
• jahtools/encoder/bootstrap.py (modified) (1 diff)
• jahtools/encoder/encoder.aps (added)
• jahtools/encoder/encoder.cpp (added)
• jahtools/encoder/encoder.rc (added)
• jahtools/encoder/encoder_vc8.vcproj (added)
• jahtools/encoder/resource.h (added)
• jahwidgets_vc8.sln (modified) (3 diffs)

trunk/installer/jahplayer.nsi

@@ -192 +192 @@
   
   SetOutPath $INSTDIR\JahPlayer\Lib
-  File /r "C:\Python25\jahplayer-pyc"
-
-;  SetOutPath $INSTDIR\JahTools
-;  SetOutPath $INSTDIR\JahTools\encoder
-;  File /r "..\JahTools\encoder\dist\*"
+  File /r "C:\Python25\jahplayer-pyc\*"
+
+  SetOutPath $INSTDIR\JahPlayer\encoder
+  File "..\Release\encoder.exe"
+  File "..\Release\wrapper.dll"
+  File "..\Release\widgets.dll"
+  File "..\Release\*.pyd"
+  File "..\jahtools\encoder\*.ui"
+  File "..\jahtools\encoder\*.py"
+  File "..\jahtools\encoder\*.png"
+  File /r "C:\Program Files\OpenLibraries\python\release\*"
+  
+  SetOutPath $INSTDIR\JahPlayer\encoder\styles
+  File "..\Release\themes.dll"
+
+  SetOutPath $INSTDIR\JahPlayer\encoder\Lib
+  File /r "C:\Python25\jahplayer-pyc\*"
 
   SetDetailsPrint both

trunk/jahplayer/footer.py

@@ -13 +13 @@
 import pickle
 import platform
-#import subprocess
 import re
 
@@ -125 +124 @@
                         os.spawnv( os.P_NOWAIT, "/usr/bin/open", ["/usr/bin/open", "-a", bundle, pickle_file] )
                 elif platform.system() == "Windows" or platform.system() == 'Microsoft':
-                        subprocess.Popen( [ os.environ[ "JAHTOOLSPATH" ] + "\encoder\encoder.exe", pickle_file ], env=os.environ )
+                        import subprocess
+                        subprocess.Popen( [ "encoder/encoder.exe", pickle_file ], env=os.environ )
                         #subprocess.Popen( [ 'c:/python25/python.exe', utilities.get_absolute_path(os.path.join( os.environ['JAH_DEVEL_ROOT'], 'jahtools/encoder/encoder.py')), pickle_file ], env=os.environ )
                 else:

trunk/jahplayer/jahplayer.cpp

@@ -5 +5 @@
 
 #include <vector>
+#include <iostream>
 
 #include <boost/python.hpp>
@@ -20 +21 @@
 #endif
 
-        Py_Main( args.size( ), &args[ 0 ] );
+        int ret = Py_Main( args.size( ), &args[ 0 ] );
+        if( ret == 1 )
+        {
+                PyObject* type;
+                PyObject* data;
+                PyObject* traceback;
+                
+                PyErr_Fetch( &type, &data, &traceback );
+                PyErr_NormalizeException( &type, &data, &traceback );
+                
+                if( type ) std::cerr << PyString_AsString( PyObject_Str( type ) );
+                if( data ) std::cerr << PyString_AsString( PyObject_Str( data ) );
+                if( traceback ) std::cerr << PyString_AsString( PyObject_Str( traceback ) );
+                
+                Py_XDECREF( type );
+                Py_XDECREF( data );
+                Py_XDECREF( traceback );
+        }
         
         Py_Finalize( );

trunk/jahplayer/jahplayer_vc8.vcproj

@@ -44 +44 @@
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 MinimalRebuild="true"
+                                ExceptionHandling="2"
                                 BasicRuntimeChecks="3"
                                 RuntimeLibrary="3"
                                 UsePrecompiledHeader="0"
-                                WarningLevel="3"
+                                WarningLevel="4"
                                 Detect64BitPortabilityProblems="true"
                                 DebugInformationFormat="4"
@@ -121 +122 @@
                                 AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34_1";C:\Python25\include;"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                                ExceptionHandling="2"
                                 RuntimeLibrary="2"
                                 UsePrecompiledHeader="0"
-                                WarningLevel="3"
+                                WarningLevel="4"
                                 Detect64BitPortabilityProblems="true"
                                 DebugInformationFormat="3"

trunk/jahtools/encoder/bootstrap.py

@@ -20 +20 @@
 import jahwidgets
 
-openpluginlib.init()
+if len( sys.argv ) > 1 and sys.argv[ 1 ] == "-release":
+        openpluginlib.init( os.path.join( os.path.dirname( sys.argv[ 0 ] ), "..", "plugins" ), 0 )
+else:
+        openpluginlib.init( );

trunk/jahwidgets_vc8.sln

@@ -3 +3 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "jahwidgets\src\qt3\python\python_vc8.vcproj", "{4DED2532-4DE3-4184-BCD4-C57D1BA0520B}"
         ProjectSection(ProjectDependencies) = postProject
+                {5BA092F5-1F55-41C3-857C-8A90B3A771FB} = {5BA092F5-1F55-41C3-857C-8A90B3A771FB}
                 {3E925FFE-47C0-42BB-BAFD-AA7E7E024312} = {3E925FFE-47C0-42BB-BAFD-AA7E7E024312}
-                {5BA092F5-1F55-41C3-857C-8A90B3A771FB} = {5BA092F5-1F55-41C3-857C-8A90B3A771FB}
         EndProjectSection
 EndProject
@@ -18 +18 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jahplayer", "jahplayer\jahplayer_vc8.vcproj", "{64BC74DD-3E2F-4E90-A098-D531DC488A2F}"
         ProjectSection(ProjectDependencies) = postProject
+                {3E925FFE-47C0-42BB-BAFD-AA7E7E024312} = {3E925FFE-47C0-42BB-BAFD-AA7E7E024312}
+                {5BA092F5-1F55-41C3-857C-8A90B3A771FB} = {5BA092F5-1F55-41C3-857C-8A90B3A771FB}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "jahtools\encoder\encoder_vc8.vcproj", "{31DC3FA2-1470-45C6-B1B1-2B478E4D146A}"
+        ProjectSection(ProjectDependencies) = postProject
+                {4DED2532-4DE3-4184-BCD4-C57D1BA0520B} = {4DED2532-4DE3-4184-BCD4-C57D1BA0520B}
                 {5BA092F5-1F55-41C3-857C-8A90B3A771FB} = {5BA092F5-1F55-41C3-857C-8A90B3A771FB}
                 {3E925FFE-47C0-42BB-BAFD-AA7E7E024312} = {3E925FFE-47C0-42BB-BAFD-AA7E7E024312}
@@ -48 +55 @@
                 {64BC74DD-3E2F-4E90-A098-D531DC488A2F}.Release|Win32.ActiveCfg = Release|Win32
                 {64BC74DD-3E2F-4E90-A098-D531DC488A2F}.Release|Win32.Build.0 = Release|Win32
+                {31DC3FA2-1470-45C6-B1B1-2B478E4D146A}.Debug|Win32.ActiveCfg = Debug|Win32
+                {31DC3FA2-1470-45C6-B1B1-2B478E4D146A}.Debug|Win32.Build.0 = Debug|Win32
+                {31DC3FA2-1470-45C6-B1B1-2B478E4D146A}.Release|Win32.ActiveCfg = Release|Win32
+                {31DC3FA2-1470-45C6-B1B1-2B478E4D146A}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution