Commits

Peter Hansen  committed 27b191b

change some hardcoded paths, add cascades to packager

  • Participants
  • Parent commits 2c475b3
  • Branches qtcascades

Comments (0)

Files changed (2)

File bin/bbpy-pyside-packager.py

 
 
 
+def get_cascades_specs():
+    return [
+        Library('qtcascades/*.so', dest='PySide/', strip=True),
+        ]
+
 def get_pyside_specs():
     return [
         Add('lib/python3.2/site-packages/PySide/__init__.py', dest='PySide/'),
 def main():
     pkg = tarfile.open('blackberry-py-{}.tar.bz2'.format(args.mode), 'w:bz2')
     try:
-        for stage in ['qt', 'pyside', 'bbpy']:
+        for stage in ['qt', 'pyside', 'bbpy', 'cascades']:
             stagedir = getattr(args, stage)
             # print 'stage dir', stagedir
             get_specs = globals()['get_{}_specs'.format(stage)]
         help='location of PySide "stage" folder')
     parser.add_argument('bbpy', type=str,
         help='location of BBPyProject working folder')
+    parser.add_argument('cascades', type=str,
+        help='location of PyCascades working folder')
     parser.add_argument('-m', '--mode', type=str, default='full', nargs='?')
 
     # note: this is global:

File qtcascadesbinding/qtcascades/CMakeLists.txt

 
 SET(qtcascades_LINK_LIBRARIES
 	${QT_QTCORE_LIBRARY}
-	/home/micke/dev/libpython3.2m.so.1.0
-	/home/micke/dev/libshiboken.cpython-32mu.so.1.1
-	/home/micke/dev/libpyside.cpython-32mu.so.1.1
+	/home/devuser/dev/libpython3.2m.so.1.0
+	/home/devuser/dev/stage/lib/libshiboken.cpython-32mu.so.1.1
+	/home/devuser/dev/stage/lib/libpyside.cpython-32mu.so.1.1
 	libbbcascades.so
 )
 
 	--enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic
 	${CMAKE_SOURCE_DIR}/qtcascades/global.h
 	--include-paths=${QT_INCLUDE_DIR}:${QNX_TARGET_DIR}/usr/include
-	--typesystem-paths=${typesystem_path}:/home/micke/dev/stage/share/PySide/typesystems
+	--typesystem-paths=${typesystem_path}:/home/devuser/dev/stage/share/PySide/typesystems
 	--output-directory=${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/typesystem_qtcascades.xml
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}