[Jsmooth-cvs] jsmooth/skeletons/consolewrapper Makefile.win, 1.4, 1.5 main.cpp, 1.16, 1.17

[Rodrigo R. <re...@us...>]

Update of /cvsroot/jsmooth/jsmooth/skeletons/consolewrapper
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18709

Modified Files:
	Makefile.win main.cpp 
Log Message:
Changed the command line arguments for the ResourceManager refactoring


Index: main.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/consolewrapper/main.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** main.cpp	4 Apr 2007 19:47:09 -0000	1.16
--- main.cpp	28 Apr 2007 08:51:05 -0000	1.17
***************
*** 44,82 ****
  }
  
- // std::string fixArgumentString(const std::string& arg)
- // {
- //   string res;
- //   for (int i=0; i<arg.length(); i++)
- //     {
- //       char c = arg[i];
- //       if (c == '\\')
- // 	{
- // 	  if ((i + 1) < arg.length())
- // 	    {
- // 	      if (arg[i+1] == '"')
- // 		{
- // 		  res += "\\§§";
- // 		}
- // 	    }
- // 	  else
- // 	    {
- // 	      res += '\\';
- // 	    }
- // 	}
- 
- //       res += c;
- //     }
- //   return res;
- // }
- 
  int main(int argc, char *argv[])
  {    
- //   for (int i=0; i<argc; i++)
- //     {
- //       printf("ARG ORIGINAL: [$%s]\n", argv[i]);
- //     }
-   
      ResourceManager* globalResMan = new ResourceManager("JAVA", PROPID, JARID);
  
      // sets up the arguments
      //
--- 44,56 ----
  }
  
  int main(int argc, char *argv[])
  {    
      ResourceManager* globalResMan = new ResourceManager("JAVA", PROPID, JARID);
  
+     for (int i=0; i<argc; i++)
+       {
+ 	DEBUG("ARGUMENT[" + StringUtils::toString(i) + "]=" + std::string(argv[i]));
+       }
+     
      // sets up the arguments
      //
***************
*** 84,88 ****
        globalResMan->setProperty(string(ResourceManager::KEY_ARGUMENTS), "");
      for (int i=1; i<argc; i++)
!       globalResMan->addUserArgument(StringUtils::fixArgumentString(argv[i]));
  
      //
--- 58,62 ----
        globalResMan->setProperty(string(ResourceManager::KEY_ARGUMENTS), "");
      for (int i=1; i<argc; i++)
!       globalResMan->addUserArgument(argv[i]);
  
      //

Index: Makefile.win
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/consolewrapper/Makefile.win,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.win	1 Mar 2007 22:03:19 -0000	1.4
--- Makefile.win	28 Apr 2007 08:51:05 -0000	1.5
***************
*** 11,15 ****
  LIBS =  -L"/lib" -L"../commonjava" -L"../util-core" ../commonjava/CommonJava.a ../util-core/util-core.a 
  INCS =  -I"/include"  -I"../commonjava"  -I"$(JDK)/include"  -I"$(JDK)/include/win32" 
! CXXINCS =  -I"/include/c++"  -I"/include/c++/mingw32"  -I"/include/c++/backward"  -I"/include"  -I"../commonjava"  -I"$(JDK)/include"  -I"$(JDK)/include/win32"   -I../util-core
  BIN  = ConsoleWrapper.exe
  CXXFLAGS = $(CUSTOMFLAGS) $(CXXINCS) -DJDK="$(JDK)"
--- 11,15 ----
  LIBS =  -L"/lib" -L"../commonjava" -L"../util-core" ../commonjava/CommonJava.a ../util-core/util-core.a 
  INCS =  -I"/include"  -I"../commonjava"  -I"$(JDK)/include"  -I"$(JDK)/include/win32" 
! CXXINCS =  -g -I"/include/c++"  -I"/include/c++/mingw32"  -I"/include/c++/backward"  -I"/include"  -I"../commonjava"  -I"$(JDK)/include"  -I"$(JDK)/include/win32"   -I../util-core
  BIN  = ConsoleWrapper.exe
  CXXFLAGS = $(CUSTOMFLAGS) $(CXXINCS) -DJDK="$(JDK)"