Changeset 4869 for branches


Ignore:
Timestamp:
Dec 13, 2014 2:03:06 PM (6 years ago)
Author:
gah
Message:
 
Location:
branches/r9
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/Makefile.in

    r4867 r4869  
    6767        blt builder cmake examples expat expect gui htmlwidget itcl \
    6868        itk lang lib optimizer shape sqlitetcl tcl tcllib \
    69         tdom tester tk tkimg tls video vtk zlib  packages
     69        tdom tester tk tkimg tls video vtk zlib  packages objects runner
    7070
    7171.PHONY: $(targets)
     
    7575all: gui lang all_packages
    7676
    77 all_packages: runner tester builder packages video optimizer
     77all_packages: runner tester objects builder packages video optimizer
     78
     79update:
     80        for i in $(srcdir)/runtime/*; do \
     81           (cd $$i; svn update; svn status) \
     82        done
    7883
    7984# Aliases for package directory names.
     
    111116video = video
    112117runner = runner
     118objects = objects
    113119
    114120subdirs = \
     
    230236endef
    231237
    232 $(builder)/timestamp: $(gui)/timestamp
     238$(builder)/timestamp: $(lib)/timestamp $(itcl)/timestamp $(gui)/timestamp
    233239        + $(clean_builder)
    234240        + $(fetch_builder)
     
    833839
    834840# -------------------------------------------------------------------------
     841#  OBJECTS
     842# -------------------------------------------------------------------------
     843
     844objects_flags = \
     845        --enable-shared \
     846        $(common_flags)
     847
     848objects: $(objects)/timestamp
     849
     850clean-objects:
     851        $(clean_objects)
     852fetch-objects:
     853        $(fetch_objects)
     854configure-objects:
     855        $(configure_objects)
     856build-objects:
     857        $(build_objects)
     858install-objects:
     859        $(install_objects)
     860touch-objects:
     861        $(touch_objects)
     862force-objects:
     863        + $(clean_objects)
     864        + $(fetch_objects)
     865        + $(configure_objects)
     866        + $(build_objects)
     867        + $(install_objects)
     868        + $(touch_objects)
     869
     870define clean_objects
     871        $(MAKE) -C $(objects) clean
     872endef
     873define fetch_objects
     874endef
     875define configure_objects
     876endef
     877define build_objects
     878        $(MAKE) -C $(objects) all
     879endef
     880define install_objects
     881        $(MAKE) -C $(objects) install
     882endef
     883define touch_objects
     884        touch $(objects)/timestamp
     885endef
     886
     887$(objects)/timestamp: $(lib)/timestamp $(itcl)/timestamp
     888        + $(clean_objects)
     889        + $(fetch_objects)
     890        + $(configure_objects)
     891        + $(build_objects)
     892        + $(install_objects)
     893        + $(touch_objects)
     894
     895
     896
     897# -------------------------------------------------------------------------
    835898#  OPTIMIZER
    836899# -------------------------------------------------------------------------
     
    883946endef
    884947
    885 $(optimizer)/timestamp: #$(gui)/timestamp
     948$(optimizer)/timestamp: $(gui)/timestamp
    886949        + $(clean_optimizer)
    887950        + $(fetch_optimizer)
     
    890953        + $(install_optimizer)
    891954        + $(touch_optimizer)
     955
     956# -------------------------------------------------------------------------
     957#  RUNNER
     958# -------------------------------------------------------------------------
     959
     960runner_flags =  \
     961        --enable-shared \
     962        $(common_flags)
     963
     964runner: $(runner)/timestamp
     965
     966clean-runner:
     967        $(clean_runner)
     968fetch-runner:
     969        $(fetch_runner)
     970configure-runner:
     971        $(configure_runner)
     972build-runner:
     973        $(build_runner)
     974install-runner:
     975        $(install_runner)
     976touch-runner:
     977        $(touch_runner)
     978force-runner:
     979        + $(clean_runner)
     980        + $(fetch_runner)
     981        + $(configure_runner)
     982        + $(build_runner)
     983        + $(install_runner)
     984        + $(touch_runner)
     985
     986define clean_runner
     987        $(MAKE) -C $(runner) clean
     988endef
     989define fetch_runner
     990endef
     991define configure_runner
     992endef
     993define build_runner
     994        $(MAKE) -C $(runner) all
     995endef
     996define install_runner
     997        $(MAKE) -C $(runner) install
     998endef
     999define touch_runner
     1000        touch $(runner)/timestamp
     1001endef
     1002
     1003$(runner)/timestamp: $(lib)/timestamp $(itcl)/timestamp $(gui)/timestamp
     1004        + $(clean_runner)
     1005        + $(fetch_runner)
     1006        + $(configure_runner)
     1007        + $(build_runner)
     1008        + $(install_runner)
     1009        + $(touch_runner)
     1010
    8921011
    8931012# -------------------------------------------------------------------------
     
    14721591endef
    14731592
    1474 $(video)/timestamp: #$(gui)/timestamp
     1593$(video)/timestamp: $(gui)/timestamp
    14751594        + $(clean_video)
    14761595        + $(fetch_video)
     
    15981717        + $(install_zlib)
    15991718        + $(touch_zlib)
     1719
  • branches/r9/configure

    r4867 r4869  
    80608060
    80618061
    8062 ac_config_files="$ac_config_files Makefile apps/Makefile apps/about apps/copy_rappture_examples apps/encodedata apps/rappture apps/rappture-csh.env apps/rappture.env apps/rappture.use apps/rerun apps/simsim apps/xmldiff builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile packages/DicomToVtk/Makefile packages/DicomToVtk/pkgIndex.tcl packages/DxToVtk/Makefile packages/DxToVtk/pkgIndex.tcl packages/Makefile packages/PdbToVtk/Makefile packages/PdbToVtk/pkgIndex.tcl packages/diffview/Makefile packages/diffview/pkgIndex.tcl packages/hotspot/Makefile packages/hotspot/pkgIndex.tcl packages/listbox/Makefile packages/listbox/pkgIndex.tcl packages/placard/Makefile packages/placard/pkgIndex.tcl packages/readpoints/Makefile packages/readpoints/pkgIndex.tcl packages/squeezer/Makefile packages/squeezer/pkgIndex.tcl packages/system/Makefile packages/system/pkgIndex.tcl runner/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile"
     8062ac_config_files="$ac_config_files Makefile apps/Makefile apps/about apps/copy_rappture_examples apps/encodedata apps/rappture apps/rappture-csh.env apps/rappture.env apps/rappture.use apps/rerun apps/simsim apps/xmldiff builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile packages/DicomToVtk/Makefile packages/DicomToVtk/pkgIndex.tcl packages/DxToVtk/Makefile packages/DxToVtk/pkgIndex.tcl packages/Makefile packages/PdbToVtk/Makefile packages/PdbToVtk/pkgIndex.tcl packages/diffview/Makefile packages/diffview/pkgIndex.tcl packages/hotspot/Makefile packages/hotspot/pkgIndex.tcl packages/listbox/Makefile packages/listbox/pkgIndex.tcl packages/placard/Makefile packages/placard/pkgIndex.tcl packages/readpoints/Makefile packages/readpoints/pkgIndex.tcl packages/squeezer/Makefile packages/squeezer/pkgIndex.tcl packages/system/Makefile packages/system/pkgIndex.tcl objects/Makefile runner/Makefile runner/pkgIndex.tcl runner/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile"
    80638063
    80648064cat >confcache <<\_ACEOF
     
    88068806    "packages/system/Makefile") CONFIG_FILES="$CONFIG_FILES packages/system/Makefile" ;;
    88078807    "packages/system/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/system/pkgIndex.tcl" ;;
     8808    "objects/Makefile") CONFIG_FILES="$CONFIG_FILES objects/Makefile" ;;
    88088809    "runner/Makefile") CONFIG_FILES="$CONFIG_FILES runner/Makefile" ;;
     8810    "runner/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES runner/pkgIndex.tcl" ;;
     8811    "runner/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES runner/scripts/Makefile" ;;
    88098812    "tester/Makefile") CONFIG_FILES="$CONFIG_FILES tester/Makefile" ;;
    88108813    "tester/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES tester/pkgIndex.tcl" ;;
  • branches/r9/configure.in

    r4867 r4869  
    353353    packages/system/Makefile
    354354    packages/system/pkgIndex.tcl
     355    objects/Makefile
    355356    runner/Makefile
     357    runner/pkgIndex.tcl
     358    runner/scripts/Makefile
    356359    tester/Makefile
    357360    tester/pkgIndex.tcl
  • branches/r9/lang/tcl/scripts/Makefile.in

    r4868 r4869  
    4444all:
    4545
     46#
     47# Scripts used with the Rappture Tcl bindings are installed in the same
     48# directory as the scripts for the Rappture runner.  This means we have to
     49# be careful about updating/installing the tclIndex file.
     50#
    4651install:
    4752        $(MKDIR_P) -m 0755 $(destdir)
  • branches/r9/objects/Makefile.in

    r4209 r4869  
    1414INSTALL_DATA    = ${INSTALL} -m 644
    1515INSTALL_SCRIPT  = ${INSTALL}
    16 TCL_VERSION     = @TCL_VERSION@
    17 TCLSH           = $(bindir)/tclsh$(TCL_VERSION)
     16TCLSH           = $(bindir)/tclsh
    1817VERSION         = @PACKAGE_VERSION@
    1918VPATH           = $(srcdir)
     
    3938
    4039FILES           = \
    41                 $(srcdir)/exec.tcl \
    42                 $(srcdir)/getopts.tcl \
    43                 $(srcdir)/library.tcl \
    44                 $(srcdir)/objects.tcl \
    45                 $(srcdir)/resources.tcl \
    46                 $(srcdir)/result.tcl \
    47                 $(srcdir)/task.tcl \
    48                 $(srcdir)/units.tcl \
    49                 $(srcdir)/xauth.tcl
     40                $(srcdir)/objects.tcl
    5041
    5142OBJECTS         = \
     
    8475                $(srcdir)/validations/size.tcl
    8576
    86 all: tclIndex
     77all:
    8778
    88 tclIndex: install-objects install-types install-validations $(FILES)
    89         $(TCLSH) $(srcdir)/../cf/mkindex.tcl --srcdir $(srcdir) \
     79install: install-scripts install-objects install-types install-validations
     80        $(TCLSH) $(srcdir)/../cf/mkindex.tcl --srcdir $(destdir) \
    9081                --outfile tclIndex
    9182        $(TCLSH) $(srcdir)/../cf/mkobjects.tcl --srcdir $(srcdir) \
    9283                $(OBJECTS)
     84        $(RM) $(destdir)/tclIndex
     85        $(INSTALL) -m 0444 tclIndex $(destdir)
    9386
    94 install: tclIndex
     87install-scripts:
    9588        $(MKDIR_P) -m 0755 $(destdir)
    9689        for i in $(FILES); do \
    9790            $(INSTALL) -m 0444 $$i $(destdir) ; \
    9891        done
    99         $(INSTALL) -m 0444 tclIndex $(destdir)
    10092
    10193install-objects:
    10294        $(MKDIR_P) -m 0755 $(destdir)/objects
    10395        $(INSTALL) -m 0444 $(srcdir)/objects/base.rp $(destdir)/objects
    104         for i in $(OBJECTS); do \
    105             echo "Installing object definition: $$i" ; \
    106             $(MKDIR_P) -m 0755 $(destdir)/objects/$$i ; \
    107             for j in $(srcdir)/objects/$$i/*; do \
    108                 $(INSTALL) -m 0444 $$j $(destdir)/objects/$$i ; \
     96        for dir in $(OBJECTS); do \
     97            echo "Installing object definition: $$dir" ; \
     98            $(MKDIR_P) -m 0755 $(destdir)/objects/$$dir ; \
     99            for file in $(srcdir)/objects/$$dir/*; do \
     100                $(INSTALL) -m 0444 $$file $(destdir)/objects/$$dir ; \
    109101            done \
    110102        done
     
    112104install-types: $(TYPEFILES)
    113105        $(MKDIR_P) -m 0755 $(destdir)/types
    114         @for i in $(TYPEFILES); do \
     106        for i in $(TYPEFILES); do \
    115107            echo "Installing $$i" ; \
    116             $(INSTALL) -m 555 $$i $(destdir)/types ; \
     108            $(INSTALL) -m 0444 $$i $(destdir)/types ; \
    117109        done
    118110
    119111install-validations: $(VALIDATEFILES)
    120112        $(MKDIR_P) -m 0755 $(destdir)/validations
    121         @for i in $(VALIDATEFILES); do \
     113        for i in $(VALIDATEFILES); do \
    122114            echo "Installing $$i" ; \
    123             $(INSTALL) -m 555 $$i $(destdir)/validations ; \
     115            $(INSTALL) -m 0444 $$i $(destdir)/validations ; \
    124116        done
    125117
  • branches/r9/runner/Makefile.in

    r4867 r4869  
    88mandir          = @mandir@
    99prefix          = @prefix@
     10srcdir          = @srcdir@
    1011
    1112destdir         = $(libdir)/Rappture$(PACKAGE_VERSION)
     
    3940                $(srcdir)/library.xml
    4041
    41 .PHONY: src scripts tests
     42.PHONY: src scripts
    4243
    4344all:
     
    5556        $(MAKE) -C scripts install
    5657
    57 test:
    58         $(MAKE) -C tests all
    59 
    6058clean:
    61         $(MAKE) -C tests clean
    6259        $(MAKE) -C scripts clean
    6360
    6461distclean: clean
    65         $(MAKE) -C tests distclean
    6662        $(MAKE) -C scripts distclean
    6763        $(RM) Makefile
  • branches/r9/runner/scripts/Makefile.in

    r4867 r4869  
    5353            $(INSTALL) -m 0444 $$i $(destdir) ; \
    5454        done
    55         $(TCLSH) $(srcdir)/../cf/mkindex.tcl --srcdir $(destdir) \
     55        $(TCLSH) $(srcdir)/../../cf/mkindex.tcl --srcdir $(destdir) \
    5656                --outfile tclIndex
    5757        $(RM) $(destdir)/tclIndex
  • branches/r9/tester/scripts/Makefile.in

    r4867 r4869  
    3535destdir         = $(libdir)/$(name)/scripts
    3636
    37 all: tclIndex
     37all:
    3838
    39 tclIndex: $(FILES)
    40         $(TCLSH) $(srcdir)/../../gui/cf/mkindex.tcl --srcdir $(srcdir) \
     39install: install_scripts install_images
     40        $(TCLSH) $(srcdir)/../../cf/mkindex.tcl --srcdir $(srcdir) \
    4141                --outfile tclIndex
    42 
    43 install: all install_scripts install_images
     42        $(RM) $(destdir)/tclIndex
     43        $(INSTALL) -m 0444 tclIndex $(destdir)
    4444
    4545install_scripts:
    4646        $(MKDIR_P) -m 0755 $(destdir)
    47         @for i in $(FILES); do \
     47        for i in $(FILES); do \
    4848            echo "Installing $$i" ; \
    4949            $(INSTALL) -m 444 $$i $(destdir) ; \
     
    5353install_images:
    5454        $(MKDIR_P) -m 0755 $(destdir)/images
    55         @for i in $(srcdir)/images/*.png; do \
     55        for i in $(srcdir)/images/*.png; do \
    5656            echo "Installing $$i" ; \
    5757            $(INSTALL) -m 444 $$i $(destdir)/images ; \
Note: See TracChangeset for help on using the changeset viewer.