windows spec file adaptions first part

bareos · Dec 20, 2017 · b4c7e3c · b4c7e3c
1 parent e9ed6df
commit b4c7e3c
Show file tree

Hide file tree

Showing 2 changed files with 194 additions and 168 deletions.
diff --git a/platforms/win32/winbareos32.spec b/platforms/win32/winbareos32.spec
@@ -42,8 +42,9 @@ BuildRequires:  %{mingw}-cross-gcc
 BuildRequires:  %{mingw}-cross-gcc-c++
 BuildRequires:  %{mingw}-cross-binutils
 BuildRequires:  %{mingw}-cross-pkg-config
-BuildRequires:  %{mingw}-libqt4-devel
 BuildRequires:  %{mingw}-libqt4
+BuildRequires:  %{mingw}-libqt4-devel
+BuildRequires:  %{mingw}-libqt4-filesystem
 BuildRequires:  %{mingw}-libwinpthread1
 BuildRequires:  %{mingw}-winpthreads-devel
 BuildRequires:  %{mingw}-libopenssl-devel
@@ -79,6 +80,7 @@ BuildRequires:  less
 BuildRequires:  procps
 BuildRequires:  sed
 BuildRequires:  vim
+BuildRequires:  cmake
 
 %description
 Base package for Bareos Windows build.
@@ -116,97 +118,108 @@ done
 %build
 
 for flavor in %flavors; do
-   cd $flavor/src/win32/
-   WIN_VISTACOMPAT=$(echo $flavor | grep postvista >/dev/null && echo yes || echo no)
-   WIN_DEBUG=$(echo $flavor | grep debug >/dev/null && echo yes || echo no)
-   make WIN_DEBUG=$WIN_DEBUG BUILD_QTGUI=%{BUILD_QTGUI} WIN_VERSION=%{WIN_VERSION} WIN_VISTACOMPAT=$WIN_VISTACOMPAT %{?jobs:-j%jobs}
-   cd -
-
-   for UNITTEST_DIR in %dirs_with_unittests; do
-      cd $flavor/src/win32/${UNITTEST_DIR}/unittests
-      make WIN_DEBUG=$WIN_DEBUG BUILD_QTGUI=%{BUILD_QTGUI} WIN_VERSION=%{WIN_VERSION} WIN_VISTACOMPAT=$WIN_VISTACOMPAT %{?jobs:-j%jobs}
-      cd -
-   done
-
-   for cfg in $flavor/src/console/bconsole.conf.in; do
-     cp $cfg $flavor/src/defaultconfigs/
-   done
 
-#  rename all "*.conf.in" files to "*.conf"
-   find $flavor/src/defaultconfigs/ -name "*.in" -exec sh -c 'name={}; newname=`echo $name | sed 's/.in$//'`; mv $name $newname' \;
+pushd $flavor
+%{_mingw64_cmake_qt4} \
+   -DCMAKE_INSTALL_BINDIR:PATH=%{_mingw64_bindir} \
+   -Dsqlite3=yes
+   make %{?jobs:-j%jobs}
+
+#   cd $flavor/src/win32/
+#   WIN_VISTACOMPAT=$(echo $flavor | grep postvista >/dev/null && echo yes || echo no)
+#   WIN_DEBUG=$(echo $flavor | grep debug >/dev/null && echo yes || echo no)
+#   make WIN_DEBUG=$WIN_DEBUG BUILD_QTGUI=%{BUILD_QTGUI} WIN_VERSION=%{WIN_VERSION} WIN_VISTACOMPAT=$WIN_VISTACOMPAT %{?jobs:-j%jobs}
+#   cd -
+#
+#   for UNITTEST_DIR in %dirs_with_unittests; do
+#      cd $flavor/src/win32/${UNITTEST_DIR}/unittests
+#      make WIN_DEBUG=$WIN_DEBUG BUILD_QTGUI=%{BUILD_QTGUI} WIN_VERSION=%{WIN_VERSION} WIN_VISTACOMPAT=$WIN_VISTACOMPAT %{?jobs:-j%jobs}
+#      cd -
+#   done
+#
+#   for cfg in $flavor/src/console/bconsole.conf.in; do
+#     cp $cfg $flavor/src/defaultconfigs/
+#   done
+#
+##  rename all "*.conf.in" files to "*.conf"
+#   find $flavor/src/defaultconfigs/ -name "*.in" -exec sh -c 'name={}; newname=`echo $name | sed 's/.in$//'`; mv $name $newname' \;
+   popd
 done
 
 
 %install
 for flavor in %flavors; do
+   pushd $flavor
+   make install
+#   mkdir -p $RPM_BUILD_ROOT%{bindir}/$flavor
+#
+#   for UNITTEST_DIR in %dirs_with_unittests; do
+#      cp $flavor/src/win32/${UNITTEST_DIR}/unittests/*.exe $RPM_BUILD_ROOT%{bindir}/$flavor
+#   done
+#
+#   cd $flavor/src/win32
+#   cp qt-tray-monitor/bareos-tray-monitor.exe \
+#      console/bconsole.exe \
+#      filed/bareos-fd.exe \
+#      stored/bareos-sd.exe \
+#      stored/btape.exe \
+#      stored/bls.exe \
+#      stored/bextract.exe \
+#      stored/bscan.exe \
+#      dird/bareos-dir.exe \
+#      dird/bareos-dbcheck.exe \
+#      tools/bsmtp.exe \
+#      tools/bregex.exe \
+#      tools/bwild.exe \
+#      tests/grow.exe \
+#      tests/bregtest.exe \
+#      stored/libbareossd*.dll \
+#      cats/libbareoscats*.dll \
+#      lib/libbareos.dll \
+#      findlib/libbareosfind.dll \
+#      lmdb/libbareoslmdb.dll \
+#      plugins/filed/bpipe-fd.dll \
+#      plugins/filed/mssqlvdi-fd.dll \
+#      plugins/filed/python-fd.dll \
+#      plugins/stored/autoxflate-sd.dll \
+#      plugins/stored/python-sd.dll \
+#      plugins/dird/python-dir.dll \
+#      $RPM_BUILD_ROOT%{bindir}/$flavor
+#   cd -
+#
+#   install -m 755 platforms/win32/bareos-config-deploy.bat $RPM_BUILD_ROOT/%{bindir}/$flavor
+#
+#   mkdir -p $RPM_BUILD_ROOT%{bindir}/$flavor/Plugins
+## identical for all flavors
+#   cp src/plugins/dird/*.py src/plugins/stored/*.py src/plugins/filed/*.py $RPM_BUILD_ROOT%{bindir}/$flavor/Plugins
+#
+#
+#   mkdir -p $RPM_BUILD_ROOT/etc/$flavor/%name/config/
+#
+#   cd $flavor/src/defaultconfigs/
+#   for cfg in %{bareos_configs}; do
+#     cp -r $cfg $RPM_BUILD_ROOT/etc/$flavor/%name/config/$cfg
+#   done
+#   cd -
+#
+#   mkdir -p $RPM_BUILD_ROOT/etc/$flavor/%name/ddl/
+#
+#   for i in creates drops grants updates; do
+#      mkdir $RPM_BUILD_ROOT/etc/$flavor/%name/ddl/$i/
+#      cp -av src/cats/ddl/$i/postgres* $RPM_BUILD_ROOT/etc/$flavor/%name/ddl/$i/
+#   done
+#
+#   for i in creates updates; do
+#      cp -av src/cats/ddl/$i/sqlite* $RPM_BUILD_ROOT/etc/$flavor/%name/ddl/$i/
+#   done
+#
+#   for sql in $RPM_BUILD_ROOT/etc/$flavor//%name/ddl/*/*.sql; do
+#      sed -f platforms/win32/fillup.sed $sql -i
+#   done
+#
+#   cp platforms/win32/fillup.sed $RPM_BUILD_ROOT/etc/$flavor/%name/
 
-   mkdir -p $RPM_BUILD_ROOT%{bindir}/$flavor
-
-   for UNITTEST_DIR in %dirs_with_unittests; do
-      cp $flavor/src/win32/${UNITTEST_DIR}/unittests/*.exe $RPM_BUILD_ROOT%{bindir}/$flavor
-   done
-
-   cd $flavor/src/win32
-   cp qt-tray-monitor/bareos-tray-monitor.exe \
-      console/bconsole.exe \
-      filed/bareos-fd.exe \
-      stored/bareos-sd.exe \
-      stored/btape.exe \
-      stored/bls.exe \
-      stored/bextract.exe \
-      stored/bscan.exe \
-      dird/bareos-dir.exe \
-      dird/bareos-dbcheck.exe \
-      tools/bsmtp.exe \
-      tools/bregex.exe \
-      tools/bwild.exe \
-      tests/grow.exe \
-      tests/bregtest.exe \
-      stored/libbareossd*.dll \
-      cats/libbareoscats*.dll \
-      lib/libbareos.dll \
-      findlib/libbareosfind.dll \
-      lmdb/libbareoslmdb.dll \
-      plugins/filed/bpipe-fd.dll \
-      plugins/filed/mssqlvdi-fd.dll \
-      plugins/filed/python-fd.dll \
-      plugins/stored/autoxflate-sd.dll \
-      plugins/stored/python-sd.dll \
-      plugins/dird/python-dir.dll \
-      $RPM_BUILD_ROOT%{bindir}/$flavor
-   cd -
-
-   install -m 755 platforms/win32/bareos-config-deploy.bat $RPM_BUILD_ROOT/%{bindir}/$flavor
-
-   mkdir -p $RPM_BUILD_ROOT%{bindir}/$flavor/Plugins
-# identical for all flavors
-   cp src/plugins/dird/*.py src/plugins/stored/*.py src/plugins/filed/*.py $RPM_BUILD_ROOT%{bindir}/$flavor/Plugins
-
-
-   mkdir -p $RPM_BUILD_ROOT/etc/$flavor/%name/config/
-
-   cd $flavor/src/defaultconfigs/
-   for cfg in %{bareos_configs}; do
-     cp -r $cfg $RPM_BUILD_ROOT/etc/$flavor/%name/config/$cfg
-   done
-   cd -
-
-   mkdir -p $RPM_BUILD_ROOT/etc/$flavor/%name/ddl/
-
-   for i in creates drops grants updates; do
-      mkdir $RPM_BUILD_ROOT/etc/$flavor/%name/ddl/$i/
-      cp -av src/cats/ddl/$i/postgres* $RPM_BUILD_ROOT/etc/$flavor/%name/ddl/$i/
-   done
-
-   for i in creates updates; do
-      cp -av src/cats/ddl/$i/sqlite* $RPM_BUILD_ROOT/etc/$flavor/%name/ddl/$i/
-   done
-
-   for sql in $RPM_BUILD_ROOT/etc/$flavor//%name/ddl/*/*.sql; do
-      sed -f platforms/win32/fillup.sed $sql -i
-   done
 
-   cp platforms/win32/fillup.sed $RPM_BUILD_ROOT/etc/$flavor/%name/
 done
 
 %clean