[Octave-cvsupdate] SF.net SVN: octave:[9935] trunk/octave-forge/main/geometry

[<jpi...@us...>]

Revision: 9935
          http://octave.svn.sourceforge.net/octave/?rev=9935&view=rev
Author:   jpicarbajal
Date:     2012-03-17 12:41:13 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
geometry: fixing install

Modified Paths:
--------------
    trunk/octave-forge/main/geometry/PKG_ADD
    trunk/octave-forge/main/geometry/PKG_DEL
    trunk/octave-forge/main/geometry/inst/octclip/src/Makefile

Modified: trunk/octave-forge/main/geometry/PKG_ADD
===================================================================
--- trunk/octave-forge/main/geometry/PKG_ADD	2012-03-17 10:23:00 UTC (rev 9934)
+++ trunk/octave-forge/main/geometry/PKG_ADD	2012-03-17 12:41:13 UTC (rev 9935)
@@ -1,20 +1,29 @@
 %1
 dirlist = {"geom2d","io","polygons2d","shape2d","octclip", "graphs"};
 dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
+pp = strsplit (dirname,filesep (), true);
 
+%% Check if prefix was used
+[pkg_folder dep_folder] = pkg ("prefix");
+pkg_folder = [pkg_folder filesep() strcat(filesep(),{pp{end-1:end}}){:} ];
+dep_folder = [dep_folder filesep() strcat(filesep(),{pp{end-1:end}}){:} ];
+
 %% If we are in Architecture dependent folder add from outside
 arch = cstrcat (octave_config_info ("canonical_host_type"),
                               "-", octave_config_info ("api_version"));
-pp = strsplit (dirname,filesep (), true);
-if strcmp(arch , pp{end})
+if strcmp (arch , pp{end})
   dirname = [strcat(filesep(),{pp{1:end-1}}){:}];
+  pkg_folder = strsplit (pkg_folder,filesep (), true);
+  pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
 end
 
 if (! exist (fullfile (dirname, "inst"), "dir"))
+%% Installing
   for ii=1:length (dirlist)
-    addpath ( [ dirname filesep dirlist{ii}],"-end")
+    addpath ( [ pkg_folder filesep() dirlist{ii}],"-end")
   endfor
 else
+%% Testing
   warning("geometry:Devel","Adding path for testing.");
   for ii=1:length(dirlist)
     addpath ([ dirname "/inst/" dirlist{ii}])

Modified: trunk/octave-forge/main/geometry/PKG_DEL
===================================================================
--- trunk/octave-forge/main/geometry/PKG_DEL	2012-03-17 10:23:00 UTC (rev 9934)
+++ trunk/octave-forge/main/geometry/PKG_DEL	2012-03-17 12:41:13 UTC (rev 9935)
@@ -1,20 +1,28 @@
 %1
 dirlist = {"geom2d","io","polygons2d","shape2d","octclip","graphs"};
 dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
+pp = strsplit (dirname,filesep (), true);
 
+%% Check if prefix was used
+[pkg_folder dep_folder] = pkg ("prefix");
+pkg_folder = [pkg_folder filesep() strcat(filesep(),{pp{end-1:end}}){:} ];
+dep_folder = [dep_folder filesep() strcat(filesep(),{pp{end-1:end}}){:} ];
+
 %% If we are not in Architecture dependent folder
 arch = cstrcat (octave_config_info ("canonical_host_type"),
                               "-", octave_config_info ("api_version"));
 pp = strsplit (dirname,filesep (), true);
 if strcmp(arch , pp{end})
   dirname = [strcat(filesep(),{pp{1:end-1}}){:}];
+  pkg_folder = strsplit (pkg_folder,filesep (), true);
+  pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
 end
 
 if (! exist (fullfile (dirname, "inst"), "dir"))
+## Run this if the package is installed
   for ii=1:length (dirlist)
-      ## Run this if the package is installed
-      rmpath ( [ dirname filesep dirlist{ii}])
-  end
+    rmpath ( [ pkg_folder filesep() dirlist{ii}])
+  endfor
 else
   warning("geometry:Devel","Removing path for testing.");
   for ii=1:length(dirlist)

Modified: trunk/octave-forge/main/geometry/inst/octclip/src/Makefile
===================================================================
--- trunk/octave-forge/main/geometry/inst/octclip/src/Makefile	2012-03-17 10:23:00 UTC (rev 9934)
+++ trunk/octave-forge/main/geometry/inst/octclip/src/Makefile	2012-03-17 12:41:13 UTC (rev 9935)
@@ -5,15 +5,15 @@
 
 CLIPOBJECT = compilador.o errores.o eucli.o fgeneral.o greiner.o polig.o \
              ptopol.o segmento.o ventorno.o
+FLAGS = -Wall -Wextra
 
-all:   _oc_polybool.oct
-
 %.o: %.c
-	$(MKOCTFILE) -I. -c $<
+	$(MKOCTFILE) $(FLAGS) -I. -c $<
 
 %.oct: %.cc $(CLIPOBJECT)
-	$(MKOCTFILE) -v  -I. $(CLIPOBJECT) -s $<
+	$(MKOCTFILE) $< $(CLIPOBJECT) $(FLAGS) -v  -I.
 
+all: _oc_polybool.oct
 
 clean:
 	rm -rf *.o *~

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.