Changeset 1075 for packaging/qt.spec

Timestamp:

Sep 11, 2011, 7:57:24 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Fixed install script.

File:

• packaging/qt.spec (modified) (7 diffs)

packaging/qt.spec

@@ -59 +59 @@
 %if "%{?QT_SOURCE_TREE}" == ""
 %define QT_SOURCE_TREE .
-%endif
-
-%if "%{?QT_BUILD_TREE}" != ""
-%define skip_prep 1
-%define skip_build 1
-%define skip_install 1
 %endif
 
@@ -86 +80 @@
 %define qtM                 %{name}%{ver_major}
 
+
+
+
 #------------------------------------------------------------------------------
 # main package
@@ -337 +334 @@
 %else
 # use passed source tree as is (shadow build)
-%setup -n "%{name}-%{version}" -TDc
+%setup -n "%{name}-%{version}" -T
 %endif
 %else
@@ -364 +361 @@
 check_var "PSQL_INCLUDEPATH"
 check_var "PSQL_LIBS"
+
+
 
 # Qt links to some OS/2 DLLs directly (w/o import libs)
@@ -391 +390 @@
 
 # make sure the right DLLs are used by the build (and in particular by qdoc
-# in make install) in case if there is another Qt version installed
+# in make ) in case if there is another Qt version installed
 export PATH="$BUILDDIR_D\\bin\;$PATH"
 export BEGINLIBPATH="$BUILDDIR_D\\bin\;$BEGINLIBPATH"
 
+
+
+
+
+
 cmd /c $QT_SOURCE_TREE_D\\configure.cmd $library_paths
 
+
+
+
+
+
+
 # qdoc needs the qsqlite plugin but nothing is installed to target locations
 # yet, so generate qt.conf to override paths
@@ -406 +416 @@
 Demos = demos" \
 > "%{_builddir}/%{buildsubdir}/bin/qt.conf"
-
-make -j$MAKE_JOBS
-
-%if !0%{?skip_build_docs}
 make docs -j$MAKE_JOBS
+
 %endif
 
@@ -423 +430 @@
 rm -rf %{buildroot}
 
-make install INSTALL_ROOT=%{buildroot}
+# Qt links to some OS/2 DLLs directly (w/o import libs)
+export LIBRARY_PATH=%{os2_boot_drive}/OS2/DLL\;%{os2_boot_drive}/MPTN/DLL\;$LIBRARY_PATH
+
+# CMD.EXE is required by the build process for now
+export MAKESHELL=%{os2_boot_drive}\\OS2\\CMD.EXE
+
+# exclude install_htmldocs from install targets
+make install_subtargets install_qchdocs install_qmake install_mkspecs \
+    INSTALL_ROOT=$(echo "%{buildroot}/@unixroot" | sed -re 's,/,\\,g')
 
 # copy READMEs (make install doesn't do that)
-cp %{QT_SOURCE_TREE}/LICENSE.* \
-   %{QT_SOURCE_TREE}/LGPL_EXCEPTION.txt \
-   %{QT_SOURCE_TREE}/README \
-   %{QT_SOURCE_TREE}/changes-%{ver_major}.%{ver_minor}.%{ver_} \
-   %{QT_SOURCE_TREE}/README.OS2 \
-   %{QT_SOURCE_TREE}/CHANGES.OS2 \
-   %{pkg_docdir}/
+mkdir -p %{buildroot}/%{pkg_docdir}/
+cp -dp \
+    %{QT_SOURCE_TREE}/LICENSE.* \
+    %{QT_SOURCE_TREE}/LGPL_EXCEPTION.txt \
+    %{QT_SOURCE_TREE}/README \
+    %{QT_SOURCE_TREE}/changes-%{ver_major}.%{ver_minor}.%{ver_patch} \
+    %{QT_SOURCE_TREE}/README.OS2 \
+    %{QT_SOURCE_TREE}/CHANGES.OS2 \
+    %{buildroot}/%{pkg_docdir}/
 
 %endif # if !0%{?skip_install}