another approach to ts build
authorapg <apg@76c9efe7-43af-4aca-a270-d8da3bf5252a>
Fri, 5 Mar 2010 18:35:30 +0000 (18:35 +0000)
committerapg <apg@76c9efe7-43af-4aca-a270-d8da3bf5252a>
Fri, 5 Mar 2010 18:35:30 +0000 (18:35 +0000)
git-svn-id: svn://oss.syntext.com/oss/serna-free/trunk@287 76c9efe7-43af-4aca-a270-d8da3bf5252a

3rd/qt/install.bat
3rd/qt/install.sh
3rd/qt/qt-defaults.pro

index a32a8df..1cdd863 100644 (file)
@@ -36,6 +36,7 @@ for %%F in (%LIB_TARGETS%) do (
 )
 
 xcopy /y /q /e /c /r %INST_SRCDIR%\translations\*.* %THIRD_DIR%\qt\translations\
+
 rd /s /q %THIRD_DIR%\qt\include
 xcopy /y /q /e /c /r %INST_SRCDIR%\include\*.* %THIRD_DIR%\qt\include\
 copy /b /y %INST_SRCDIR%\tools\porting\src\q3porting.xml %THIRD_DIR%\qt\q3porting.xml
@@ -44,3 +45,6 @@ dir /b /s %THIRD_DIR%\qt\include\*.h | %THIRD_DIR%\bin\python %~dp0fixincludes.p
 
 xcopy /y /q /c /r %INST_SRCDIR%\plugins\imageformats\*.dll %THIRD_DIR%\qt\plugins\imageformats\
 copy /y %THIRD_DIR%\qt\MANIFEST.qt %THIRD_DIR%\qt\MANIFEST
+
+cd %THIRD_DIR%\qt\translations
+..\..\bin\lrelease qt*.ts
index d22bae9..b8ce6b3 100755 (executable)
@@ -82,6 +82,9 @@ for f in ${DLL_TARGETS}; do
 done
 
 install_file ../${INST_RELDIR}/translations ${THIRD_DIR}/qt
+
+${THIRD_DIR}/bin/lrelease ${THIRD_DIR}/qt/translations/qt_*.ts
+
 rm -fr include
 tar -C ../${INST_RELDIR} -cf - include | tar -C ${THIRD_DIR}/qt -xf -
 find include -type f -a -name "*.h" | ${THIRD_DIR}/bin/python fixincludes.py ${INST_SRCDIR}
index da3b9d8..b25431d 100644 (file)
@@ -1,7 +1,6 @@
 # TMake settings for qt as a Serna Editor 3rd component
 
-
-PACKAGE_CFG_OPTIONS += \
+PACKAGE_CFG_OPTIONS *= \
                       -qt-gif \
                       -no-libmng \
                       -qt-libpng \
@@ -17,7 +16,6 @@ PACKAGE_CFG_OPTIONS += \
                       -no-scripttools \
                       -qt-sql-sqlite \
                       -confirm-license \
-                      -developer-build \
                       -opensource
 
 release:PACKAGE_CFG_OPTIONS *= -release
@@ -46,8 +44,6 @@ unix:PACKAGE_CFG_OPTIONS *=     \
 PACKAGE_CFG_ENV     = QMAKESPEC=$(QMAKESPEC) QTPREFIX=$(QTPREFIX)
                                 
 QT_ASSISTANT_CUSTOM_IMAGES = qt/icons/assistant
-unix:PACKAGE_MAKE_ENV = LD_LIBRARY_PATH=$(top_srcdir)/$(VERSION)/$(MAKE_DIR)/lib
-darwin:PACKAGE_MAKE_ENV = DYLD_LIBRARY_PATH=$(top_srcdir)/$(VERSION)/$(MAKE_DIR)/lib
 
 PACKAGE_TARGET  = \
                sub-moc-make_default-ordered \
@@ -62,8 +58,7 @@ PACKAGE_TARGET  = \
                sub-qt3support-make_default-ordered \
                sub-uic3-make_default-ordered \
                sub-plugins-make_default-ordered \
-               sub-tools-make_default-ordered \
-                qm-qt
+               sub-tools-make_default-ordered
 
 win32:PACKAGE_TARGET  = \
                sub-winmain-make_default-ordered \
@@ -79,11 +74,9 @@ win32:PACKAGE_TARGET  = \
                sub-qt3support-make_default-ordered \
                sub-uic3-make_default-ordered \
                sub-plugins-make_default-ordered \
-               sub-tools-make_default-ordered \
-                qm-qt
-                 
+               sub-tools-make_default-ordered
                  
-#unix:PACKAGE_MAKEOPTS = -j3
+unix:PACKAGE_MAKEOPTS = -j3
 INSTALL_ENV_VARS += QMAKESPEC
 
 BASENAME            = qt-all-opensource-src-$$VERSION