Changeset d715e35 in observatorio

Timestamp:

Sep 18, 2014, 6:00:00 PM (10 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

e8a4de7

Parents:

8200514

Message:

cambio de nombre al modulo python

Location:

simulacion/SimEscenariosEconomicos

Files:

• Makefile (modified) (5 diffs)
• _svg_builder.so (deleted)
• svg_builder.i (deleted)
• svg_builder.py (added)
• svg_sigesic_builder.C (moved) (moved from simulacion/SimEscenariosEconomicos/svg_builder.C) (1 diff)
• svg_sigesic_builder.H (moved) (moved from simulacion/SimEscenariosEconomicos/svg_builder.H) (2 diffs)
• svg_sigesic_builder.i (added)
• test_svg_builder (deleted)
• test_svg_builder.C (deleted)
• test_svg_builder.py (deleted)

simulacion/SimEscenariosEconomicos/Makefile

@@ -6 +6 @@
 
 CXX = g++ -O3 -g 
+
+SWIG = swig -python -c++
+
+PYTHONPATH = /usr/include
+
+#PYTHONINC = $(PYTHONPATH)/python2.6
+PYTHONINC = $(PYTHONPATH)/python2.7
 
 AR = ar
@@ -21 +28 @@
 
 LIBS = -L $(ALEPH) -L . -lAleph -lnana -lc -lm -lgsl -lgslcblas -lpthread \
-                        -lasprintf -lpq -l$(LIBNAME)
+                        -lpq -l$(LIBNAME)
                    
 GB = graph_builder
@@ -27 +34 @@
 SIM = simulator
 
-SB = svg_builder
+SSB = svg_sigesic_builder
 
 SBC = svg_builder_canviz
 
-WRAP = svg_builder_wrap
+WRAP = $(SSB)_wrap
 
 SOURCES = dbProperties.C dbConnection.C dbQuery.C common.C strQuery.C \
@@ -51 +58 @@
         $(CXX) $(INCLUDE) $(SIM).C -o $(PREFIX)$(SIM) $(LIBS) $(FLAGS)
 
-sb:
-        $(CXX) -c $(INCLUDE) $(SB).C $(LIBS) $(FLAGS)
-        $(CXX) $(INCLUDE) test_svg_builder.C -o test_svg_builder svg_builder.o $(LIBS) $(XML) $(FLAGS)
-
 sbc:
         $(CXX) $(INCLUDE) $(SBC).C -o $(SBC) $(LIBS) $(FLAGS)
 
 python: obj
-        $(CXX) -c $(INCLUDE) $(SB).C $(FLAGS) -fPIC
-        swig -python -c++ svg_builder.i
-        $(CXX) -c $(INCLUDE) -I /usr/include/python2.7 $(WRAP).cxx $(FLAGS) -fPIC
-        $(CXX) -shared $(INCLUDE) *.o -o _svg_builder.so $(LIBS) $(XML) $(FLAGS) -fPIC
+        $(CXX) -c $(INCLUDE) $(SSB).C $(FLAGS) -fPIC
+        $(SWIG) $(SSB).i
+        $(CXX) -c $(INCLUDE) -I $(PYTHONINC) $(WRAP).cxx $(FLAGS) -fPIC
+        $(CXX) -shared $(INCLUDE) *.o -o _$(SSB).so $(LIBS) $(XML) $(FLAGS) -fPIC
 
 obj:
@@ -72 +75 @@
         $(RM) *~ *.o $(SB).py* $(WRAP).*
 clean-all:
-        $(RM) *~ *.o $(SBC) $(SB).py* $(WRAP).* $(PREFIX)$(GB) $(PREFIX)$(SIM) $(SB) $(LOCALLIB)
+        $(RM) *~ *.o $(SBC) $(SSB).py* $(WRAP).* $(PREFIX)$(GB) $(PREFIX)$(SIM) $(SB) $(LOCALLIB) _$(SSB).so
 

simulacion/SimEscenariosEconomicos/svg_sigesic_builder.C

@@ -14 +14 @@
 
 # include <cstdarg>
-# include <svg_builder.H>
+# include <svg_sigesic_builder.H>
 
 int buildSvg(const int & levelsup, const int & levelsdown,

simulacion/SimEscenariosEconomicos/svg_sigesic_builder.H

@@ -1 @@
-# ifndef SVG_BUILDER_H
-# define SVG_BUILDER_H
+# ifndef SVG_SIGESIC_BUILDER_H
+# define SVG_SIGESIC_BUILDER_H
 
 # include <cstdlib>
@@ -16 +16 @@
              const char * const baseName, std::vector<long> & codes);
 
-# endif // SVG_BUILDER_H
+# endif // SVG_SIGESIC_BUILDER_H