Source: vite
Version: 1.2+svn1430-1
Severity: wishlist
Tags: patch

Hi,

currently, vite is configured with builddir==srcdir, which causes all
the generated cmake files to be created under the source directory.

Attached it is a patch to let dh do its cmake invocation, which uses a
subdirectory as builddir; this has few advantages:
- cmake is invoked with the standard flags (like verbosity and prefix)
- there is less clutter in the source directory after the build
- cleaning the build is simplier (rm -rf $builddir)
- given the default Debian prefix (= /usr) is passed, the usual
  `make install` can be reenabled again, since `vite` will be properly
  copied in the package directory debian/vite (with no need to manually
  copy it via install file)

To the aforementioned changes I added also a couple of
documentation-generated files to debian/toclean, as those were appearing
in my test builds and not cleaned.

Thanks,
-- 
Pino
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
-src/vite /usr/bin
 vite.xpm /usr/share/pixmaps
 debian/vite.desktop /usr/share/applications
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DEB_BUILD_HARDENING=1
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	cmake . -DVITE_ENABLE_OTF=ON \
+	dh_auto_configure -- -DVITE_ENABLE_OTF=ON \
 		-DVITE_ENABLE_MT_PARSERS=ON
 
 override_dh_auto_build:
@@ -14,8 +14,6 @@ override_dh_auto_build:
 	$(MAKE) -C docs/user_manual
 	$(MAKE) -C docs/technical_manual
 
-override_dh_auto_install:
-
 override_dh_auto_clean:
 	$(MAKE) -C docs/user_manual clean
 	$(MAKE) -C docs/technical_manual clean
--- a/debian/toclean
+++ b/debian/toclean
@@ -1,49 +1,5 @@
-CMakeCache.txt
-CMakeFiles/CMakeCCompiler.cmake
-CMakeFiles/cmake.check_cache
-CMakeFiles/CMakeCXXCompiler.cmake
-CMakeFiles/CMakeDetermineCompilerABI_C.bin
-CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
-CMakeFiles/CMakeDirectoryInformation.cmake
-CMakeFiles/CMakeError.log
-CMakeFiles/CMakeOutput.log
-CMakeFiles/CMakeRuleHashes.txt
-CMakeFiles/CMakeSystem.cmake
-CMakeFiles/CompilerIdC/a.out
-CMakeFiles/CompilerIdC/CMakeCCompilerId.c
-CMakeFiles/CompilerIdCXX/a.out
-CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
-CMakeFiles/dist.dir/build.make
-CMakeFiles/dist.dir/cmake_clean.cmake
-CMakeFiles/dist.dir/DependInfo.cmake
-CMakeFiles/dist.dir/progress.make
-CMakeFiles/Makefile2
-CMakeFiles/Makefile.cmake
-CMakeFiles/progress.marks
-CMakeFiles/TargetDirectories.txt
-cmake_install.cmake
-CPackConfig.cmake
-CPackSourceConfig.cmake
-Makefile
-plugins/CMakeFiles/CMakeDirectoryInformation.cmake
-plugins/CMakeFiles/progress.marks
-plugins/cmake_install.cmake
-plugins/Makefile
-src/CMakeFiles/CMakeDirectoryInformation.cmake
-src/CMakeFiles/progress.marks
-src/CMakeFiles/vite.dir/build.make
-src/CMakeFiles/vite.dir/C.includecache
-src/CMakeFiles/vite.dir/cmake_clean.cmake
-src/CMakeFiles/vite.dir/CXX.includecache
-src/CMakeFiles/vite.dir/DependInfo.cmake
-src/CMakeFiles/vite.dir/depend.internal
-src/CMakeFiles/vite.dir/depend.make
-src/CMakeFiles/vite.dir/flags.make
-src/CMakeFiles/vite.dir/link.txt
-src/CMakeFiles/vite.dir/progress.make
-src/cmake_install.cmake
 src/common/ViteConfig.hpp
-src/interface/vite.qrc.depends
-src/Makefile
 docs/technical_manual/technical_manual.pdf
 docs/technical_manual/technical_manual.dvi
+docs/user_manual/user_manual.bbl
+docs/user_manual/user_manual.blg

Reply via email to