[Jsmooth-cvs] jsmooth/skeletons/simplewrap Makefile.win, 1.13, 1.14 description.skel, 1.9, 1.10 main.cpp, 1.30, 1.31 mainres.rc, 1.6, 1.7 resource.h, 1.2, 1.3

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

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

Modified Files:
	Makefile.win description.skel main.cpp mainres.rc resource.h 
Log Message:
implements the JNI JSmooth functions


Index: mainres.rc
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/simplewrap/mainres.rc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mainres.rc	1 Mar 2007 22:03:19 -0000	1.6
--- mainres.rc	18 May 2007 21:34:00 -0000	1.7
***************
*** 1,7 ****
- 
  #include "resource.h"
  
  JARID JAVA "../samplejar/sample.jar"
  PROPID JAVA "../samplejar/sample.props"
  
  A2 ICON MOVEABLE PURE LOADONCALL DISCARDABLE "JWrap.ico"
--- 1,7 ----
  #include "resource.h"
  
  JARID JAVA "../samplejar/sample.jar"
  PROPID JAVA "../samplejar/sample.props"
+ JNISMOOTHID JAVA "../jnismooth/jnismooth.jar"
  
  A2 ICON MOVEABLE PURE LOADONCALL DISCARDABLE "JWrap.ico"

Index: main.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/simplewrap/main.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** main.cpp	17 May 2007 10:56:16 -0000	1.30
--- main.cpp	18 May 2007 21:34:00 -0000	1.31
***************
*** 60,64 ****
      SingleInstanceManager instanceman;
  
!     globalResMan = new ResourceManager("JAVA", PROPID, JARID);
  
      // sets up the command line arguments
--- 60,64 ----
      SingleInstanceManager instanceman;
  
!     globalResMan = new ResourceManager("JAVA", PROPID, JARID, JNISMOOTHID);
  
      // sets up the command line arguments
***************
*** 73,76 ****
--- 73,79 ----
    bool dodebug = globalResMan->getBooleanProperty("skel_Debug");
  
+   // TO REMOVE
+   dodebug = true;
+ 
    if (dodebug)
      {
***************
*** 112,116 ****
      else
        man.setUseConsole(false);
!     man.setPreferDLL(globalResMan->getBooleanProperty("skel_SingleProcess"));
      int retvalue = 0;
  
--- 115,127 ----
      else
        man.setUseConsole(false);
! 
!     bool singleprocess = globalResMan->getBooleanProperty("skel_SingleProcess");
!     bool jnismooth = globalResMan->getBooleanProperty("skel_JniSmooth");
! 
!     if (singleprocess || jnismooth)
!       man.setPreferDLL(true);
!     else
!       man.setPreferDLL(false);
! 
      int retvalue = 0;
  

Index: Makefile.win
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/simplewrap/Makefile.win,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.win	1 Mar 2007 22:03:19 -0000	1.13
--- Makefile.win	18 May 2007 21:34:00 -0000	1.14
***************
*** 2,6 ****
  # Makefile created by Dev-C++ 4.9.8.0
  
! RM   = CMD /C DEL
  CPP  = g++.exe
  CC   = gcc.exe
--- 2,6 ----
  # Makefile created by Dev-C++ 4.9.8.0
  
! RM   = rm -f 
  CPP  = g++.exe
  CC   = gcc.exe
***************
*** 11,15 ****
  LIBS =  -L"/lib" -L"../commonjava"  -L"../util-core" -mwindows ../commonjava/CommonJava.a ../util-core/util-core.a
  INCS =  -I"/include"  -I"$(JDK)/include/win32"  -I"$(JDK)/include"  -I"../commonjava" -I"../util-core"
! CXXINCS =  -I"/include/c++"  -I"/include/c++/mingw32"  -I"/include/c++/backward"  -I"/include"  -I"$(JDK)/include/win32"  -I"$(JDK)/include"  -I"../commonjava"  -I../util-core
  BIN  = JWrap.exe
  CXXFLAGS = $(CUSTOMFLAGS) $(CXXINCS) -DJDK="$(JDK)"
--- 11,15 ----
  LIBS =  -L"/lib" -L"../commonjava"  -L"../util-core" -mwindows ../commonjava/CommonJava.a ../util-core/util-core.a
  INCS =  -I"/include"  -I"$(JDK)/include/win32"  -I"$(JDK)/include"  -I"../commonjava" -I"../util-core"
! CXXINCS = -g -I"/include/c++"  -I"/include/c++/mingw32"  -I"/include/c++/backward"  -I"/include"  -I"$(JDK)/include/win32"  -I"$(JDK)/include"  -I"../commonjava"  -I../util-core
  BIN  = JWrap.exe
  CXXFLAGS = $(CUSTOMFLAGS) $(CXXINCS) -DJDK="$(JDK)"
***************
*** 22,26 ****
  
  clean: clean-custom
! 	$(RM) $(OBJ) $(BIN)
  
  $(BIN): $(LINKOBJ) ../commonjava/CommonJava.a
--- 22,26 ----
  
  clean: clean-custom
! 	$(RM) $(OBJ) $(BIN) JWrap_private.res
  
  $(BIN): $(LINKOBJ) ../commonjava/CommonJava.a

Index: resource.h
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/simplewrap/resource.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** resource.h	11 Aug 2003 00:26:39 -0000	1.2
--- resource.h	18 May 2007 21:34:00 -0000	1.3
***************
*** 2,4 ****
--- 2,5 ----
  #define JARID 102
  #define PROPID 103
+ #define JNISMOOTHID 104
  

Index: description.skel
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/simplewrap/description.skel,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** description.skel	17 May 2007 10:56:16 -0000	1.9
--- description.skel	18 May 2007 21:34:00 -0000	1.10
***************
*** 30,43 ****
  </skeletonProperties>
  <skeletonProperties>
! <description>SKEL_GENERIC_PROPERTY_DEBUG_DESCRIPTION</description>
! <idName>Debug</idName>
! <label>SKEL_GENERIC_PROPERTY_DEBUG_LABEL</label>
  <type>boolean</type>
  <value>0</value>
  </skeletonProperties>
  <skeletonProperties>
! <description>SKEL_GENERIC_SINGLEINSTANCE_DESCRIPTION</description>
! <idName>SingleInstance</idName>
! <label>SKEL_GENERIC_SINGLEINSTANCE</label>
  <type>boolean</type>
  <value>0</value>
--- 30,50 ----
  </skeletonProperties>
  <skeletonProperties>
! <description>SKEL_GENERIC_SINGLEINSTANCE_DESCRIPTION</description>
! <idName>SingleInstance</idName>
! <label>SKEL_GENERIC_SINGLEINSTANCE</label>
  <type>boolean</type>
  <value>0</value>
  </skeletonProperties>
  <skeletonProperties>
! <description>SKEL_GENERIC_JNISMOOTH_DESCRIPTION</description>
! <idName>JniSmooth</idName>
! <label>SKEL_GENERIC_JNISMOOTH</label>
! <type>boolean</type>
! <value>0</value>
! </skeletonProperties>
! <skeletonProperties>
! <description>SKEL_GENERIC_PROPERTY_DEBUG_DESCRIPTION</description>
! <idName>Debug</idName>
! <label>SKEL_GENERIC_PROPERTY_DEBUG_LABEL</label>
  <type>boolean</type>
  <value>0</value>