Changeset 2485

Show
Ignore:
Timestamp:
08/02/08 12:05:11 (4 months ago)
Author:
jhasse
Message:

Fixing #49 and #80

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • main/trunk/ChangeLog

    r2484 r2485  
     12008-08-02  Jan Niklas Hasse <jhasse@gmail.com> 
     2        * DESIGN: Deleted, seems to be out of date. 
     3        * doc/root_names: Replacing tabs with spaces. 
     4        * doc/DEVELOPER-HINTS: Replacing makeinstaller with makepackage. 
     5        Fixes #80 
     6        * makepackage: Warning about CRLF in specfiles. Fixes #49 
     7 
    182008-08-02  Jan Niklas Hasse <jhasse@gmail.com> 
    29        * share/stub.(2.)template: Adding file format information to the 

  • main/trunk/doc/DEVELOPER-HINTS

    r732 r2485  
    7878main/doc/api - automatically generated API documentation 
    7979main/doc - general doc files 
    80 main/makeinstaller - the script that builds .package files 
     80main/makepackage - the script that builds .package files 
    8181main/share/apkg-ttyfe - the terminal frontend program 
    8282main/share/apkg-funclib - general functions that don't fit anywhere else, and the file you import to get all the rest of the code  
    …… 
    128128For more information on this, see the document main/doc/root_names 
    129129 
    130  
    131  

  • main/trunk/doc/root_names

    r732 r2485  
    44----------- 
    55 
    6 Package:       An Autopackage .package file. 
    7 Software:      The software itself. 
     6Package:       An Autopackage .package file. 
     7Software:      The software itself. 
    88 
    99 
    …… 
    140140 
    141141require "@gtk.org/gtk" 1             # valid 
    142 require "@gtk.org/gtk" 1.2          # valid 
     142require "@gtk.org/gtk" 1.2           # valid 
    143143require "@gtk.org/gtk:2.0.0:1" 1     # invalid 
    144144 
    …… 
    203203ROOTNAME may or may not contain a software version number. 
    204204If it does: 
    205        MAJOR and REVISION are ignored. 
    206        Search the harddisk and network for a packages that matches the given 
    207        version number. Out of those packages, select the one with the highest 
    208        package number. 
     205        MAJOR and REVISION are ignored. 
     206        Search the harddisk and network for a packages that matches the given 
     207        version number. Out of those packages, select the one with the highest 
     208        package number. 
    209209If it doesn't: 
    210        MAJOR will be a required parameter and REVISION an optional one. 
    211        1. Search the harddisk and network for packages that match MAJOR. 
    212           If REVISION is specified: 
    213                1.1. Out of those packages, select the ones with a revision 
    214                     version number that is equal or higher than REVISION. 
    215                     Then select the ones with the highest REVISION number. 
    216        2. Select the ones with the highest software number. 
    217        3. Select the ones with the highest package number. 
     210        MAJOR will be a required parameter and REVISION an optional one. 
     211        1. Search the harddisk and network for packages that match MAJOR. 
     212           If REVISION is specified: 
     213                1.1. Out of those packages, select the ones with a revision 
     214                     version number that is equal or higher than REVISION. 
     215                     Then select the ones with the highest REVISION number. 
     216        2. Select the ones with the highest software number. 
     217        3. Select the ones with the highest package number. 
    218218 
    219219 
    …… 
    264264Are you confused with all the different version numbers? We have: 
    265265 
    266 Software version:      The version number of the software, as defined by the 
    267                        maintainer. Tends to be put on websites etc 
    268  
    269 Package version:       The number of the package. Similar to RPM's Release 
    270                        number. Used only in the specfile. Used for "bugfix 
    271                        releases" of a package itself. 
    272  
    273 Interface version:     Version number used to determine the interface 
    274                        compatibility of the software. 
    275                        + Major 
    276                        + Revision 
     266Software version:       The version number of the software, as defined by the 
     267                        maintainer. Tends to be put on websites etc 
     268 
     269Package version:        The number of the package. Similar to RPM's Release 
     270                        number. Used only in the specfile. Used for "bugfix 
     271                        releases" of a package itself. 
     272 
     273Interface version:      Version number used to determine the interface 
     274                        compatibility of the software. 
     275                        + Major 
     276                        + Revision 

  • main/trunk/makepackage

    r2481 r2485  
    488488                red; outn "FAIL: "; normal; 
    489489                out "$specfile could not be found" 
     490                return 1 
     491        fi 
     492 
     493        if [[ $(file "$specfile" | grep CRLF | wc -l) == 1 ]]; then 
     494                red; outn "WARNING: "; normal; out "Specfile %s contains Windows line terminators (CRLF) and is therefor not compatible with makepackage. To fix this, replace them with the unix line feeds using the following command:\nsed 's/\\\\r\$//' -i %s" "$specfile" "$specfile" 
    490495                return 1 
    491496        fi