[Pkg-octave-commit] r2708 - dynare/trunk/debian

[Sébastien Villemot]

Author: sebastien-guest
Date: 2009-03-06 16:16:44 +0000 (Fri, 06 Mar 2009)
New Revision: 2708

Removed:
   dynare/trunk/debian/README.source
   dynare/trunk/debian/dynare-matlab7.4.install
   dynare/trunk/debian/dynare-matlab7.5.install
Modified:
   dynare/trunk/debian/rules
Log:
Removed Matlab-specific stuff

Deleted: dynare/trunk/debian/README.source
===================================================================
--- dynare/trunk/debian/README.source	2009-03-06 16:16:17 UTC (rev 2707)
+++ dynare/trunk/debian/README.source	2009-03-06 16:16:44 UTC (rev 2708)
@@ -1,16 +0,0 @@
-The 'rules' file can build packages dynare-matlab7.4 and dynare-matlab7.5,
-which contain DLLs for Matlab 7.4 and 7.5.
-
-By default, the 'rules' file assumes that you have installed these Matlab (R)
-versions in /usr/local/matlab74 and /usr/local/matlab75 respectively. If you
-installed them somewhere else, please correct the environment variables at the
-beginning of the 'rules' file.
-
-Note that if any of these two directories doesn't exist, the corresponding
-package will not be built.
-
-Also note that the 'rules' file plays with Matlab (R) license manager,
-launching it before building the MEX files, and killing it after. You must kill
-any license manager before building the package, otherwise it fill fail. Also
-note that if you have a single-user license, you must obviously build the
-package with the user account which has the right to use the license.

Deleted: dynare/trunk/debian/dynare-matlab7.4.install
===================================================================
--- dynare/trunk/debian/dynare-matlab7.4.install	2009-03-06 16:16:17 UTC (rev 2707)
+++ dynare/trunk/debian/dynare-matlab7.4.install	2009-03-06 16:16:44 UTC (rev 2708)
@@ -1 +0,0 @@
-mex/2007a/*.mex*        /usr/lib/dynare/mex/2007a

Deleted: dynare/trunk/debian/dynare-matlab7.5.install
===================================================================
--- dynare/trunk/debian/dynare-matlab7.5.install	2009-03-06 16:16:17 UTC (rev 2707)
+++ dynare/trunk/debian/dynare-matlab7.5.install	2009-03-06 16:16:44 UTC (rev 2708)
@@ -1 +0,0 @@
-mex/2007b/*.mex*        /usr/lib/dynare/mex/2007b

Modified: dynare/trunk/debian/rules
===================================================================
--- dynare/trunk/debian/rules	2009-03-06 16:16:17 UTC (rev 2707)
+++ dynare/trunk/debian/rules	2009-03-06 16:16:44 UTC (rev 2708)
@@ -1,39 +1,15 @@
 #!/usr/bin/make -f
 
-MATLAB74_ROOT=/usr/local/matlab74
-MATLAB75_ROOT=/usr/local/matlab75
-
-# Build only Matlab packages for which Matlab is installed on this machine
-export DH_OPTIONS
-DH_OPTIONS += $(shell test -d $(MATLAB74_ROOT) || echo "-Ndynare-matlab7.4 ")
-DH_OPTIONS += $(shell test -d $(MATLAB75_ROOT) || echo "-Ndynare-matlab7.5 ")
-
 build: build-stamp
 build-stamp:
 	dh_testdir
 
 	# Building preprocessor
-	# It is necessary to build it with g++ 4.1 to avoid dynamic
-	# loading problems under Matlab 7.4 and 7.5
-	make -C preprocessor CXX=g++-4.1
+	make -C preprocessor
 
 	# Building Octave MEX/OCT files
 	cd mex/sources && octave build_octave.m
 
-	# Building Matlab 7.4 MEX files
-ifeq ($(shell test -d $(MATLAB74_ROOT) && echo yes), yes)
-	$(MATLAB74_ROOT)/etc/lmboot
-	cd mex/sources && $(MATLAB74_ROOT)/bin/matlab -nodisplay -r build_matlab_debian
-	$(MATLAB74_ROOT)/etc/lmdown
-endif
-
-	# Building Matlab 7.5 MEX files
-ifeq ($(shell test -d $(MATLAB75_ROOT) && echo yes), yes)
-	$(MATLAB75_ROOT)/etc/lmboot
-	cd mex/sources && $(MATLAB75_ROOT)/bin/matlab -nodisplay -r build_matlab_debian
-	$(MATLAB75_ROOT)/etc/lmdown
-endif
-
 	# Building documentation
 	make -C doc
 
@@ -45,9 +21,8 @@
 	make clean -C preprocessor
 	make clean -C doc
 	find mex/sources -name *.o | xargs rm -f
-	rm -f mex/octave/*.mex mex/2007a/* mex/2007b/*
-	rm -f matlab/dynare_m matlab/dynare_m.exe
-	rm -rf preprocessor/doc/html
+	rm -f mex/octave/*.mex
+	rm -f matlab/dynare_m
 	rm -f build-stamp
 	dh_clean