Changeset 1590

Show
Ignore:
Timestamp:
05/22/06 06:39:55 (3 years ago)
Author:
mrenzmann
Message:

(Re-)Introduces the Makefile target "release", adjusted for the
Subversion repository and the new layout of the project. This target
is useful for developers only (for obvious reasons), so you need to
have read/write access to the repository.

Details are described in ticket #230 and the yet-to-be-written wiki
page http://madwifi.org/wiki/DevDocs/PreparingReleases

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile

    r1535 r1590  
    4747DIRS_MODULES=   ${ATH_HAL} ${WLAN} ${ATH_RATE} ${ATH} 
    4848 
     49# export for make-release.bash 
     50export ATH_HAL 
     51 
    4952all: modules tools 
    5053 
    51 modules: configcheck svnversion.h  
     54modules: configcheck svnversion.h 
    5255        mkdir -p ${SYMBOLSDIR} 
    5356        for i in ${DIRS_MODULES}; do \ 
    …… 
    5962        if [ -d .svn ]; then \ 
    6063                ver=`svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'`; \ 
     64                echo "#define SVNVERSION \"svn r$$ver\"" > $@; \ 
    6165        elif [ -s SNAPSHOT ]; then \ 
    6266                ver=`sed -e '/^Revision: */!d;s///;q' SNAPSHOT`; \ 
    63         else \ 
    64                 ver=`date +%F`; \ 
     67                echo "#define SVNVERSION \"svn r$$ver\"" > $@; \ 
    6568        fi; \ 
    66         echo "#define SVNVERSION \"$$ver\"" > $@ 
    6769 
    6870# conflicts with the 'tools' subdirectory 
    …… 
    131133        @echo "ok." 
    132134 
     135.PHONY: release 
     136release: 
     137        sh scripts/make-release.bash 
     138 
    133139# new targets should be inserted ABOVE this line in order to avoid 
    134140# problems with the included kernel configuration file below. 

  • trunk/Makefile.inc

    r1535 r1590  
    213213 
    214214SYMBOLSDIR=${DEPTH}/symbols 
     215 
     216 
     217# The following variables will affect developers only, and are used in the 
     218# make-release.bash script. 
     219# 
     220# RELEASE_TMP is used as a temporary store for the files needed to create the 
     221# release tarball. Packaging will take place in TMPDIR/madwifi-release. 
     222# Defaults to /tmp. 
     223RELEASE_TMP=/tmp 
     224 
     225# RELEASE_STORE is the (local) directory where the release tarball should be 
     226# stored in. Defaults to the parent directory of the working copy used to 
     227# create the release. 
     228RELEASE_STORE=.. 
     229 
     230# expose these settings to make-release.bash 
     231export RELEASE_TMP RELEASE_STORE 

  • trunk/ath/if_ath_ahb.c

    r1525 r1590  
    401401 */ 
    402402#include "version.h" 
    403 #include "svnversion.h" 
    404 static char *version = ATH_PCI_VERSION " (svn " SVNVERSION ")"; 
     403#include "release.h" 
     404static char *version = ATH_PCI_VERSION " (" RELEASE_VERSION ")"; 
    405405static char *dev_info = "ath_ahb"; 
    406406 
    …… 
    424424MODULE_DESCRIPTION("Support for Atheros 802.11 wireless LAN cards."); 
    425425#ifdef MODULE_VERSION 
    426 MODULE_VERSION("svn "SVNVERSION); 
     426MODULE_VERSION(RELEASE_VERSION); 
    427427#endif 
    428428MODULE_SUPPORTED_DEVICE("Atheros WLAN cards"); 

  • trunk/ath/if_ath_pci.c

    r1556 r1590  
    318318 */ 
    319319#include "version.h" 
    320 #include "svnversion.h" 
    321 static char *version = ATH_PCI_VERSION " (svn " SVNVERSION ")"; 
     320#include "release.h" 
     321static char *version = ATH_PCI_VERSION " (" RELEASE_VERSION ")"; 
    322322static char *dev_info = "ath_pci"; 
    323323 
    …… 
    346346MODULE_DESCRIPTION("Support for Atheros 802.11 wireless LAN cards."); 
    347347#ifdef MODULE_VERSION 
    348 MODULE_VERSION("svn "SVNVERSION); 
     348MODULE_VERSION(RELEASE_VERSION); 
    349349#endif 
    350350MODULE_SUPPORTED_DEVICE("Atheros WLAN cards"); 

  • trunk/ath_rate/amrr/amrr.c

    r1525 r1590  
    548548static struct ctl_table_header *ath_sysctl_header; 
    549549 
    550 #include "svnversion.h" 
    551 static char *version = "0.1 (svn " SVNVERSION ")"; 
     550#include "release.h" 
     551static char *version = "0.1 (" RELEASE_VERSION ")"; 
    552552static char *dev_info = "ath_rate_amrr"; 
    553553 
    …… 
    555555MODULE_DESCRIPTION("AMRR Rate control algorithm"); 
    556556#ifdef MODULE_VERSION 
    557 MODULE_VERSION("svn "SVNVERSION); 
     557MODULE_VERSION(RELEASE_VERSION); 
    558558#endif 
    559559#ifdef MODULE_LICENSE 

  • trunk/ath_rate/onoe/onoe.c

    r1525 r1590  
    495495static struct ctl_table_header *ath_sysctl_header; 
    496496 
    497 #include "svnversion.h" 
    498 static char *version = "1.0 (svn " SVNVERSION ")"; 
     497#include "release.h" 
     498static char *version = "1.0 (" RELEASE_VERSION ")"; 
    499499static char *dev_info = "ath_rate_onoe"; 
    500500 
    …… 
    502502MODULE_DESCRIPTION("Atsushi Onoe's rate control algorithm for Atheros devices"); 
    503503#ifdef MODULE_VERSION 
    504 MODULE_VERSION("svn "SVNVERSION); 
     504MODULE_VERSION(RELEASE_VERSION); 
    505505#endif 
    506506#ifdef MODULE_LICENSE 

  • trunk/ath_rate/sample/sample.c

    r1525 r1590  
    104104 */ 
    105105 
    106 #include "svnversion.h" 
    107 static char *version = "1.2 (svn " SVNVERSION ")"; 
     106#include "release.h" 
     107static char *version = "1.2 (" RELEASE_VERSION ")"; 
    108108static char *dev_info = "ath_rate_sample"; 
    109109 
    …… 
    940940MODULE_DESCRIPTION("SampleRate bit-rate selection algorithm for Atheros devices"); 
    941941#ifdef MODULE_VERSION 
    942 MODULE_VERSION("svn "SVNVERSION); 
     942MODULE_VERSION(RELEASE_VERSION); 
    943943#endif 
    944944#ifdef MODULE_LICENSE 

  • trunk/net80211/ieee80211_linux.c

    r1525 r1590  
    746746 */ 
    747747#include "version.h" 
    748 #include "svnversion.h" 
    749 static char *version = WLAN_VERSION " (svn " SVNVERSION ")"; 
     748#include "release.h" 
     749static char *version = WLAN_VERSION " (" RELEASE_VERSION ")"; 
    750750static char *dev_info = "wlan"; 
    751751 
    …… 
    753753MODULE_DESCRIPTION("802.11 wireless LAN protocol support"); 
    754754#ifdef MODULE_VERSION 
    755 MODULE_VERSION("svn "SVNVERSION); 
     755MODULE_VERSION(RELEASE_VERSION); 
    756756#endif 
    757757#ifdef MODULE_LICENSE 

  • trunk/release.h

    r1426 r1590  
    3636 * $Id$ 
    3737 */ 
     38#include "svnversion.h" 
    3839#define RELEASE_TYPE    "BETA" 
     40#define RELEASE_VERSION SVNVERSION