/[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 392 by johnpye, Mon Mar 6 03:11:28 2006 UTC revision 393 by johnpye, Thu Mar 30 14:46:37 2006 UTC
# Line 125  Type::getSimulation(SymChar sym){ Line 125  Type::getSimulation(SymChar sym){
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";  /*
129        THE FOLLOWING STUFF IS CURRENTLY BROKEN.
130        The reason is that we need to add configuration options with SCons that
131        pass in the correct values here. These values need to correspond with
132        the *installed* location of things like 'Makefile.bt' (if that is what is
133        to be used, that is), where the ASCEND libs are, etc, whatever.
134    */
135    //      bin_targetstem = ASCEND_TMPDIR "/asc_bintoken";
136            bin_targetstem = "/tmp/asc_bintoken";
137          bin_srcname = bin_targetstem + ".c";          bin_srcname = bin_targetstem + ".c";
138          bin_objname = bin_targetstem + ".o";          bin_objname = bin_targetstem + ".o";
139          bin_libname = bin_targetstem + ".so";          bin_libname = bin_targetstem + ".so";
140          bin_rm = "/bin/rm";          bin_rm = "/bin/rm";
141  #if 1  #if 0
142          bin_cmd = "make -C " ASCEND_TMPDIR " -f " ASCEND_MAKEFILEDIR_1 "/Makefile.bt" \  //      bin_cmd = "make -C " ASCEND_TMPDIR " -f " ASCEND_MAKEFILEDIR_1 "/Makefile.bt" \
143              " SO=" + bin_targetstem + " ASCEND_INCDIR=\"" ASCEND_INCDIR "\" ASCEND_LIBDIR=\"" ASCEND_LIBDIR "\"";      //      " SO=" + bin_targetstem + " ASCEND_INCDIR=\"" ASCEND_INCDIR "\" ASCEND_LIBDIR=\"" ASCEND_LIBDIR "\"";
144    //
145          cerr << "BINTOKEN COMMAND" << endl << "----" << bin_cmd << endl << "----" << endl;      //  cerr << "BINTOKEN COMMAND" << endl << "----" << bin_cmd << endl << "----" << endl;
146    
147    #elif 0
148    //# define BTINCLUDES "-I" ASCEND_INCDIR
149        //  bin_cmd = "cd " ASCEND_INCDIR " && make BTTARGET=" + bin_targetstem + " BTINCLUDES=" BTINCLUDES \
150        //      " -f " ASCEND_MAKEFILEDIR "/Makefile.bt " + bin_targetstem;
151  #else  #else
152  # define BTINCLUDES "-I" ASCEND_INCDIR          bin_cmd = "echo \"FIXME: BINTOKEN COMMANDLINE PARAMETERS\" && exit 1";
         bin_cmd = "cd " ASCEND_INCDIR " && make BTTARGET=" + bin_targetstem + " BTINCLUDES=" BTINCLUDES \  
             " -f " ASCEND_MAKEFILEDIR "/Makefile.bt " + bin_targetstem;  
153  #endif  #endif
154          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()
155                              , bin_cmd.c_str(), bin_rm.c_str(), 1000, 1, 0);                              , bin_cmd.c_str(), bin_rm.c_str(), 1000, 1, 0);

Legend:
Removed from v.392  
changed lines
  Added in v.393

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