[Javaprofiler-commits] CVS: library README,1.29,1.30 config.mk,1.26,1.27

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/javaprofiler/library
In directory usw-pr-cvs1:/tmp/cvs-serv20956

Modified Files:
	README config.mk 
Log Message:
win32 port

Index: README
===================================================================
RCS file: /cvsroot/javaprofiler/library/README,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** README	2001/11/21 22:31:37	1.29
--- README	2001/11/25 22:33:47	1.30
***************
*** 53,65 ****

         The library sources are written in plain C++. On Win32 platform,
!        Microsoft Visual C/C++ or Borland C/C++ 5.5.1 can be used.
!        On Unix platforms (in this time, Solaris and Linux only) GNU C/C++ 3.0.2
!        or later _MUST_ be used. Genuine Sun Workshop Compilers had problems
!        with creating the dynamic library under SunOS. So had the elder versions
         of GNU C/C++. There were some problems with generated binary code
         on Linux platform, too. Please be sure you use GCC 3.0.2 or later.

           * Microsoft Visual C/C++ 6.0
-          * Borland C/C++ 5.5.1
           * GNU C/C++ 3.0.2

--- 53,64 ----

         The library sources are written in plain C++. On Win32 platform,
!        Microsoft Visual C/C++ is used. On Unix platforms (in this time,
!        Solaris and Linux only) GNU C/C++ 3.0.2 or later _MUST_ be used.
!        Genuine Sun Workshop Compilers had problems with creating
!        the dynamic library under SunOS. So had the elder versions
         of GNU C/C++. There were some problems with generated binary code
         on Linux platform, too. Please be sure you use GCC 3.0.2 or later.

           * Microsoft Visual C/C++ 6.0
           * GNU C/C++ 3.0.2

***************
*** 84,88 ****
         and/or Java sources) is used.

!          * Doxygen 1.2.11.1

         Data flows, schemes and relations between structures are described
--- 83,87 ----
         and/or Java sources) is used.

!          * Doxygen 1.2.12

         Data flows, schemes and relations between structures are described
***************
*** 156,160 ****

     * Microsoft Visual C/C++ 6.0      (www.microsoft.com)
-    * Borland C/C++ 5.5.1             (www.borland.com)         [for free]
     * GNU C/C++ 3.0.2                 (gcc.gnu.org)             [for free]

--- 155,158 ----
***************
*** 162,166 ****

     * Microsoft Visio 2000            (www.microsoft.com)
!    * Doxygen 1.2.11.1                (www.doxygen.org)         [for free]
     * GNU make 3.7x                   (www.gnu.org)             [for free]

--- 160,164 ----

     * Microsoft Visio 2000            (www.microsoft.com)
!    * Doxygen 1.2.12                  (www.doxygen.org)         [for free]
     * GNU make 3.7x                   (www.gnu.org)             [for free]

***************
*** 194,200 ****
                (eg. "make")

!                 compile sources by "nmake /f Makefile.mak" (for Visual C/C++)
!                 or "make -f Makefile.mak" (for Borland C/C++)
!                 from top directory

         5.1.4  if successful, following files were created:
--- 192,196 ----
                (eg. "make")

!                 compile sources by "nmake" from top directory

         5.1.4  if successful, following files were created:

Index: config.mk
===================================================================
RCS file: /cvsroot/javaprofiler/library/config.mk,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** config.mk	2001/11/21 22:31:37	1.26
--- config.mk	2001/11/25 22:33:47	1.27
***************
*** 1,12 ****
  ################################################################
  # configuration file
! # Linux, x86, GNU C/C++ 3.0.2
  #
  # author: Marek Przeczek

! PROF_LIBRARY_NAME        = profiler/libprofiler.so
  PROF_JAVA_INTERF_PACKAGE = IProf.jar

! NATIVE_LIBRARY_NAME = libCommunShMem.so

  ################################################################
--- 1,12 ----
  ################################################################
  # configuration file
! # Microsoft Windows 9x/NT4.0/2000, x86, Visual C/C++ 6.0
  #
  # author: Marek Przeczek

! PROF_LIBRARY_NAME        = profiler\profiler.dll
  PROF_JAVA_INTERF_PACKAGE = IProf.jar

! NATIVE_LIBRARY_NAME = CommunShMem.dll

  ################################################################
***************
*** 15,29 ****
  # do not use "\" as a last character in path definition

! COMPILER_PATH = /home2/mm/gcc-3.0.2
! #COMPILER_PATH = /usr
! JAVA_PATH     = /home2/mm/j2sdk1.4.0
! DOXYGEN_PATH  = /home2/mm
! 
! CCC     = "$(COMPILER_PATH)/bin/g++"
! LD      = "$(COMPILER_PATH)/bin/g++"
! JAVAC   = "$(JAVA_PATH)/bin/javac"
! JAVAH   = "$(JAVA_PATH)/bin/javah"
! JAR     = "$(JAVA_PATH)/bin/jar"
! DOXYGEN = "$(DOXYGEN_PATH)/bin/doxygen"

  ################################################################
--- 15,28 ----
  # do not use "\" as a last character in path definition

! COMPILER_PATH = E:\Program Files\Microsoft Visual Studio\VC98
! JAVA_PATH     = E:\j2sdk1.4.0-beta3
! DOXYGEN_PATH  = E:\Program Files\doxygen-1.2.12
! 
! CCC     = "$(COMPILER_PATH)\Bin\cl"
! LD      = "$(COMPILER_PATH)\Bin\link"
! JAVAC   = "$(JAVA_PATH)\bin\javac"
! JAVAH   = "$(JAVA_PATH)\bin\javah"
! JAR     = "$(JAVA_PATH)\bin\jar"
! DOXYGEN = "$(DOXYGEN_PATH)\bin\doxygen"

  ################################################################
***************
*** 32,36 ****

  DOXYGENFLAGS =
! JAVACFLAGS   = -classpath ../../src2/$(PROF_JAVA_INTERF_PACKAGE)

  ################################################################
--- 31,35 ----

  DOXYGENFLAGS =
! JAVACFLAGS   = -classpath ..\..\src2\$(PROF_JAVA_INTERF_PACKAGE)

  ################################################################
***************
*** 38,70 ****
  # modify as needed

! DEFINES  = -DLINUX -DUSE_RAW_MONITORS -DUSE_ALLOCATOR -fpic
! #DEFINES  = -DLINUX -fpic

! INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/linux

  # debug or not ?
  # choose one of following two possibilities

! FLAGS   = -O0 -D_DEBUG
! #FLAGS   = -O0 -D_DEBUG -DPROF_ERROR_ON
! #FLAGS   = -O3 -DNDEBUG -fno-rtti -fno-exceptions

! LDFLAGS = $(DEFINES) -shared -o $(PROF_LIBRARY_NAME)
! LDLIBS  =

! LDFLAGS2 = $(DEFINES) -shared -o $(NATIVE_LIBRARY_NAME)
! LDLIBS2  =

! CPPFLAGS = -c $(FLAGS) $(DEFINES) $(INCLUDES)

  ################################################################
  # MAKEFILE

! MFLAGS = -f Makefile -C

  include dir.info

! all: $(addsuffix .dir.2, $(DIRS)) $(addsuffix .o, $(FILES)) 
! 
! clean: $(addsuffix .clean.2, $(DIRS))
! 	rm -Rf $(CLEAN_FILES)
--- 37,70 ----
  # modify as needed

! DEFINES  = /DWIN32 /DUSE_RAW_MONITORS /DUSE_ALLOCATOR

! INCLUDES = /I "$(JAVA_PATH)\include" /I "$(JAVA_PATH)\include\win32"

  # debug or not ?
  # choose one of following two possibilities

! FLAGS   = /Od /Zi /D_DEBUG /MDd /LDd
! #FLAGS   = /O2 /Og /Oi /Ot /Ox /DNDEBUG /MD /LD /G6 /GD

! LDFLAGS = /NOLOGO /DLL /OUT:$(PROF_LIBRARY_NAME)
! LDLIBS  = wsock32.lib winmm.lib

! LDFLAGS2 = /NOLOGO /DLL /OUT:$(NATIVE_LIBRARY_NAME)
! LDLIBS2  = wsock32.lib

! CPPFLAGS = /nologo /c $(FLAGS) $(DEFINES) $(INCLUDES)

  ################################################################
  # MAKEFILE

! MFLAGS = /NOLOGO /f Makefile.mak

  include dir.info

! all:
! 	for %i in (xxx $(DIRS))  do if not %%i == xxx $(MAKE) $(MFLAGS) %%i.dir
! 	for %i in (xxx $(FILES)) do if not %%i == xxx $(MAKE) $(MFLAGS) %%i.obj
! 
! clean:
! 	for %i in (xxx $(CLEAN_FILES)) do if exist %%i del %%i
! 	for %i in (xxx $(DIRS)) do if not %%i == xxx $(MAKE) $(MFLAGS) %%i.clean