Update of /cvsroot/jsmooth/jsmooth/skeletons/consolewrapper
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10646/consolewrapper
Modified Files:
Makefile.win main.cpp
Log Message:
Winservice DLL instanciation fix
Index: main.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/consolewrapper/main.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** main.cpp 28 Apr 2007 08:51:05 -0000 1.17
--- main.cpp 30 Apr 2007 20:54:32 -0000 1.18
***************
*** 46,91 ****
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
! //
! if (argc > 1)
! globalResMan->setProperty(string(ResourceManager::KEY_ARGUMENTS), "");
! for (int i=1; i<argc; i++)
! globalResMan->addUserArgument(argv[i]);
!
! //
! // sets up the debug mode, if requested
! std::string dodebug = globalResMan->getProperty("skel_Debug");
! if (StringUtils::parseInt(dodebug) != 0)
! {
! enableDebug = true;
! globalResMan->printDebug();
! }
! char curdir[256];
! GetCurrentDirectory(256, curdir);
! string newcurdir = globalResMan->getCurrentDirectory();
! SetCurrentDirectory(newcurdir.c_str());
! JavaMachineManager man(*globalResMan);
! if (man.run(false, false) == false)
{
! std::string errmsg = globalResMan->getProperty("skel_Message");
! cerr << errmsg.c_str();
! cerr << "\r\n";
}
int waitkey = atoi(globalResMan->getProperty("skel_PressKey").c_str());
if (waitkey != 0)
! {
! system("PAUSE");
! }
delete globalResMan;
--- 46,88 ----
int main(int argc, char *argv[])
{
! ResourceManager* globalResMan = new ResourceManager("JAVA", PROPID, JARID);
! // for (int i=0; i<argc; i++)
! // {
! // printf("CMD-ARGUMENTx[%d]=%s\n",i ,argv[i]);
! // }
! // sets up the arguments
! //
! if (argc > 1)
! globalResMan->setProperty(string(ResourceManager::KEY_ARGUMENTS), "");
! for (int i=1; i<argc; i++)
! globalResMan->addUserArgument(argv[i]);
! //
! // sets up the debug mode, if requested
! std::string dodebug = globalResMan->getProperty("skel_Debug");
! if (StringUtils::parseInt(dodebug) != 0)
! {
! enableDebug = true;
! globalResMan->printDebug();
! }
! string newcurdir = globalResMan->getCurrentDirectory();
! SetCurrentDirectory(newcurdir.c_str());
! JavaMachineManager man(*globalResMan);
! if (man.run(false, false) == false)
{
! std::string errmsg = globalResMan->getProperty("skel_Message");
! cerr << errmsg.c_str();
! cerr << "\r\n";
}
int waitkey = atoi(globalResMan->getProperty("skel_PressKey").c_str());
if (waitkey != 0)
! {
! system("PAUSE");
! }
delete globalResMan;
Index: Makefile.win
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/consolewrapper/Makefile.win,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.win 28 Apr 2007 08:51:05 -0000 1.5
--- Makefile.win 30 Apr 2007 20:54:32 -0000 1.6
***************
*** 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)"
--- 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)"
|
