Changeset 268

Show
Ignore:
Timestamp:
10/01/06 15:08:01 (2 years ago)
Author:
laurentj
Message:

petite modif sur le make pour générer les nightly

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile

    r265 r268  
    2929ifeq ($(JBT_VERSION),SVN) 
    3030JBT_VERSION=SVN-$(SVN_REVISION) 
     31endif 
     32 
     33ifndef LIB_NAME 
     34LIB_NAME=$(LIB_VERSION) 
     35endif 
     36ifndef JTPL_NAME 
     37JTPL_NAME=$(LIB_VERSION) 
     38endif 
     39ifndef JBT_NAME 
     40JBT_NAME=$(LIB_VERSION) 
    3141endif 
    3242 
    …… 
    8494        && $(PHP) build/mkdist.php build/manifests/jelix-others.mn . $(DISTJELIX) \ 
    8595        && echo "$(LIB_VERSION)" > "$(DISTJELIX)/lib/jelix/VERSION" 
    86         tar czf $(DIST)/jelix-lib-$(LIB_VERSION).tar.gz  -C $(DISTJELIX) lib/ temp/ 
     96        tar czf $(DIST)/jelix-lib-$(LIB_NAME).tar.gz  -C $(DISTJELIX) lib/ temp/ 
    8797 
    8898dist-testapp: common-dist 
    8999        $(PHP) build/mkdist.php build/manifests/testapp.mn . $(DISTJELIX) 
    90         tar czf $(DIST)/testapp-$(LIB_VERSION).tar.gz  -C $(DISTJELIX) testapp/ temp/testapp/ 
     100        tar czf $(DIST)/testapp-$(LIB_NAME).tar.gz  -C $(DISTJELIX) testapp/ temp/testapp/ 
    91101 
    92102dist-myapp: common-dist 
    93103        $(PHP) build/mkdist.php build/manifests/myapp.mn . $(DISTJELIX) 
    94         tar czf $(DIST)/myapp-$(LIB_VERSION).tar.gz  -C $(DISTJELIX) myapp/ temp/myapp/ 
     104        tar czf $(DIST)/myapp-$(LIB_NAME).tar.gz  -C $(DISTJELIX) myapp/ temp/myapp/ 
    95105 
    96106dist-modules: common-dist 
    97107        export LIB_VERSION=$(LIB_VERSION) \ 
    98108        && $(PHP) build/mkdist.php build/manifests/jelix-modules.mn lib/jelix-modules/ $(DIST)/additional-modules/ 
    99         tar czf $(DIST)/jelix-additional-modules.tar.gz  -C $(DIST) additional-modules/ 
     109        tar czf $(DIST)/jelix-additional-modules-$(LIB_NAME).tar.gz  -C $(DIST) additional-modules/ 
    100110 
    101111common-dist: 
    …… 
    140150        && $(PHP) build/mkdist.php build/manifests/jtpl-standalone.mn . $(DISTJTPL) \ 
    141151        && echo "$(JTPL_VERSION)" > "$(DISTJTPL)/VERSION" 
    142         tar czf $(DIST)/jtpl-$(JTPL_VERSION).tar.gz  -C $(DIST) jtpl/ 
     152        tar czf $(DIST)/jtpl-$(JTPL_NAME).tar.gz  -C $(DIST) jtpl/ 
    143153 
    144154jbt-dist: 
    …… 
    146156        $(PHP) build/mkdist.php build/manifests/jbuildtools.mn build/ $(DISTJBT) \ 
    147157        && echo "$(JBT_VERSION)" > "$(DISTJBT)/VERSION" 
    148         tar czf $(DIST)/jbuildtools-$(JBT_VERSION).tar.gz  -C $(DIST) jbuildtools/ 
     158        tar czf $(DIST)/jbuildtools-$(JBT_NAME).tar.gz  -C $(DIST) jbuildtools/ 
    149159 
    150160 
Download in other formats: Unified Diff Zip Archive