/[ascend]/trunk/pygtk/interface/type.cpp
ViewVC logotype

Diff of /trunk/pygtk/interface/type.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 267 by johnpye, Fri Feb 3 04:26:04 2006 UTC revision 268 by johnpye, Sat Feb 4 06:09:57 2006 UTC
# Line 121  Type::getSimulation(SymChar sym){ Line 121  Type::getSimulation(SymChar sym){
121    
122      cerr << "Type " << getName().toString() << ", getSimulation('" << sym.toString() << "')" << endl;      cerr << "Type " << getName().toString() << ", getSimulation('" << sym.toString() << "')" << endl;
123    
 #if 0  
124      // Tell ASCEND file locations and compiler commands:      // Tell ASCEND file locations and compiler commands:
125      if(0 !have_bintoken_setup){      if(0 && !have_bintoken_setup){
126          cerr << "SETUP BINTOKENS..." << endl;          cerr << "SETUP BINTOKENS..." << endl;
127    
128          bin_targetstem = ASCEND_TMPDIR "/asc_bintoken";          bin_targetstem = ASCEND_TMPDIR "/asc_bintoken";
# Line 131  Type::getSimulation(SymChar sym){ Line 130  Type::getSimulation(SymChar sym){
130          bin_objname = bin_targetstem + ".o";          bin_objname = bin_targetstem + ".o";
131          bin_libname = bin_targetstem + ".so";          bin_libname = bin_targetstem + ".so";
132          bin_rm = "/bin/rm";          bin_rm = "/bin/rm";
133    #if 1
134          bin_cmd = "make -C " ASCEND_TMPDIR " -f " ASCEND_MAKEFILEDIR_1 "/Makefile.bt" \          bin_cmd = "make -C " ASCEND_TMPDIR " -f " ASCEND_MAKEFILEDIR_1 "/Makefile.bt" \
135              " SO=" + bin_targetstem + " ASCEND_INCDIR=\"" ASCEND_INCDIR "\" ASCEND_LIBDIR=\"" ASCEND_LIBDIR "\"";              " SO=" + bin_targetstem + " ASCEND_INCDIR=\"" ASCEND_INCDIR "\" ASCEND_LIBDIR=\"" ASCEND_LIBDIR "\"";
136    
137          cerr << "BINTOKEN COMMAND" << endl << "----" << bin_cmd << endl << "----" << endl;          cerr << "BINTOKEN COMMAND" << endl << "----" << bin_cmd << endl << "----" << endl;
138    
139    #else
140    # define BTINCLUDES "-I" ASCEND_INCDIR
141            bin_cmd = "cd " ASCEND_INCDIR " && make BTTARGET=" + bin_targetstem + " BTINCLUDES=" BTINCLUDES \
142                " -f " ASCEND_MAKEFILEDIR "/Makefile.bt " + bin_targetstem;
143    #endif
144          BinTokenSetOptions(bin_srcname.c_str(), bin_objname.c_str(), bin_libname.c_str()          BinTokenSetOptions(bin_srcname.c_str(), bin_objname.c_str(), bin_libname.c_str()
145                              , bin_cmd.c_str(), bin_rm.c_str(), 1000, 1, 0);                              , bin_cmd.c_str(), bin_rm.c_str(), 1000, 1, 0);
146            
147          cerr << "...SETUP BINTOKENS" << endl;          cerr << "...SETUP BINTOKENS" << endl;
148          have_bintoken_setup = true;          have_bintoken_setup = true;
149      }      }
 #endif  
150    
151      cerr << "CREATING INSTANCE..." << endl;      cerr << "CREATING INSTANCE..." << endl;
152      // Perform the instantiation (C compile etc):      // Perform the instantiation (C compile etc):

Legend:
Removed from v.267  
changed lines
  Added in v.268

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22