Changeset 232


Ignore:
Timestamp:
Jan 10, 2011, 12:26:50 AM (15 years ago)
Author:
dmik
Message:

jdk: Enabled building demos and samples.

Location:
trunk/openjdk/jdk/make
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/make/Makefile

    r209 r232  
    262262ifndef OS2_TEMP
    263263SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
    264 else # disable various stuff
    265 SUBDIRS    = tools java javax org sun sunw com launchers
     264else # disable JPDA
     265SUBDIRS    = tools java javax org sun sunw com mkdemo mksample launchers
    266266endif
    267267all build::

  • trunk/openjdk/jdk/make/common/Demo.gmk

    r2 r232  
    2828# Some names are defined with LIBRARY inside the Defs.gmk file
    2929LIBRARY=$(DEMONAME)
     30LIBRARY_SHORT=$(DEMONAME_SHORT)
    3031OBJDIR=$(TEMPDIR)/$(DEMONAME)
    3132
    … …  
    123124ifneq ($(strip $(DEMO_ALL_NATIVE_SOURCES)),)
    124125  # Path to native library we will create
    125   DEMO_LIBRARY = \
    126       $(DEMO_DESTDIR)/lib$(ISA_DIR)/$(LIB_PREFIX)$(DEMONAME).$(LIBRARY_SUFFIX)
     126  ifneq ($(DEMONAME_SHORT),)
     127    DEMO_LIBRARY = \
     128        $(DEMO_DESTDIR)/lib$(ISA_DIR)/$(LIB_PREFIX)$(DEMONAME_SHORT).$(LIBRARY_SUFFIX)
     129  else
     130    DEMO_LIBRARY = \
     131        $(DEMO_DESTDIR)/lib$(ISA_DIR)/$(LIB_PREFIX)$(DEMONAME).$(LIBRARY_SUFFIX)
     132  endif
    127133  # C and C++ compiler flags we need to add to standard flags
    128134  DEMO_CPPFLAGS     += -I$(DEMO_BUILD_SRCDIR)

  • trunk/openjdk/jdk/make/mkdemo/Makefile

    r2 r232  
    3232include $(BUILDDIR)/common/Defs.gmk
    3333
     34ifndef OS2_TEMP
    3435SUBDIRS = applets jfc jvmti management jni scripting jpda
     36else # disable JPDA
     37SUBDIRS = applets jfc jvmti management jni scripting
     38endif
    3539
    3640all build:: nbproject

  • trunk/openjdk/jdk/make/mkdemo/jvmti/compiledMethodLoad/Makefile

    r2 r232  
    2727PRODUCT = demo/jvmti
    2828DEMONAME = compiledMethodLoad
     29DEMONAME_SHORT = cml
    2930include $(BUILDDIR)/common/Defs.gmk
    3031

  • trunk/openjdk/jdk/make/mkdemo/jvmti/heapTracker/Makefile

    r2 r232  
    2727PRODUCT = demo/jvmti
    2828DEMONAME = heapTracker
     29DEMONAME_SHORT = heapTrck
    2930include $(BUILDDIR)/common/Defs.gmk
    3031

  • trunk/openjdk/jdk/make/mkdemo/jvmti/heapViewer/Makefile

    r2 r232  
    2727PRODUCT = demo/jvmti
    2828DEMONAME = heapViewer
     29DEMONAME_SHORT = heapView
    2930include $(BUILDDIR)/common/Defs.gmk
    3031

  • trunk/openjdk/jdk/make/mkdemo/jvmti/hprof/Makefile

    r74 r232  
    3636DEMO_OBJECTS    = java_crw_demo.$(OBJECT_SUFFIX)
    3737
    38 ifeq ($(filter-out windows os2, $(PLATFORM)),)
     38ifeq ($(PLATFORM), windows)
    3939  EXTRA_LIBS += wsock32.lib winmm.lib
     40endif
     41ifeq ($(PLATFORM), os2)
     42  EXTRA_LIBS += -lwsock32.lib -lwinmm.lib
    4043endif
    4144ifeq ($(PLATFORM), solaris)

  • trunk/openjdk/jdk/make/mkdemo/jvmti/versionCheck/Makefile

    r2 r232  
    2727PRODUCT = demo/jvmti
    2828DEMONAME = versionCheck
     29DEMONAME_SHORT = verCheck
    2930include $(BUILDDIR)/common/Defs.gmk
    3031
Note: See TracChangeset for help on using the changeset viewer.