Subversion Repositories DevTools

Rev

Rev 6845 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6845 Rev 6851
Line 45... Line 45...
45 
#                       --Package=Name          - Use this package name instead
 45 
#                       --Package=Name          - Use this package name instead
46 
#                                                 of the build's name.
 46 
#                                                 of the build's name.
47 
#                                                 Not suggested
 47 
#                                                 Not suggested
48 
#                       --Plain                 - No frills
 48 
#                       --Plain                 - No frills
49 
#                       --NoPackage             - Do not package the installer
 49 
#                       --NoPackage             - Do not package the installer
- 
 
 50 
#                       --RecipeTag=nam         - Tag this recipe
50 
#
 51 
#
51 
#
 52 
#
52 
# Returns         : Will not return on error
 53 
# Returns         : Will not return on error
53 
#
 54 
#
54 
 
 55 
 
Line 60... Line 61...
60 
    my $ofile;
 61 
    my $ofile;
61 
    my @defines;
 62 
    my @defines;
62 
    my @genargs;
 63 
    my @genargs;
63 
    my $package = $ScmBuildPackage;
 64 
    my $package = $ScmBuildPackage;
64 
    my $noPackage;
 65 
    my $noPackage;
- 
 
 66 
    my @passThroughArgs;
65 
 
 67 
 
66 
    return if ( ! ActivePlatform($platforms) );
 68 
    return if ( ! ActivePlatform($platforms) );
67 
 
 69 
 
68 
    #
 70 
    #
69 
    #   Parse the command line arguments
 71 
    #   Parse the command line arguments
Line 90... Line 92...
90 
            $package = $1;
 92 
            $package = $1;
91 
 
 93 
 
92 
        } elsif  ( m~^--NoPackage~i ) {
 94 
        } elsif  ( m~^--NoPackage~i ) {
93 
            $noPackage = 1;
 95 
            $noPackage = 1;
94
96
- 
 
 97 
        } elsif  ( m~^--RecipeTag=~i ) {
- 
 
 98 
            push @passThroughArgs, $_;
- 
 
 99 
 
95 
        } else {
 100 
        } else {
96 
            Warning ("nsisDirective: Unknown option ignored: $_");
 101 
            Warning ("nsisDirective: Unknown option ignored: $_");
97 
        }
 102 
        }
98 
    }
 103 
    }
99 
 
 104 
 
Line 141... Line 146...
141 
    #   Invoke 'makensis' to do the hard work
 146 
    #   Invoke 'makensis' to do the hard work
142 
    #
 147 
    #
143 
    GenerateFiles ('*', 'makensis' ,
 148 
    GenerateFiles ('*', 'makensis' ,
144 
                        $noPackage ? '--NoGenerate' : '--AutoGenerate',
 149 
                        $noPackage ? '--NoGenerate' : '--AutoGenerate',
145 
                        '--Text=' . $ofile,
 150 
                        '--Text=' . $ofile,
- 
 
 151 
                        @passThroughArgs,
146 
                        '--NoVarTag',
 152 
                        '--NoVarTag',
147 
                        '--UnknownPreq',
 153 
                        '--UnknownPreq',
148 
                        '--CreatedProg='. $ofile,
 154 
                        '--CreatedProg='. $ofile,
149 
                        '/NOCONFIG',
 155 
                        '/NOCONFIG',
150 
                        '/NOCD',
 156 
                        '/NOCD',