Subversion Repositories DevTools

Rev

Rev 5026 | Rev 5217 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5026 Rev 5215
Line 118... Line 118...
118 
my $opt_output;
 118 
my $opt_output;
119 
my $opt_name;
 119 
my $opt_name;
120 
my $opt_variant;
 120 
my $opt_variant;
121 
my $opt_pkgarch;
 121 
my $opt_pkgarch;
122 
my $opt_tarFile;
 122 
my $opt_tarFile;
- 
 
 123 
my $opt_noarch;
123 
 
 124 
 
124 
#
 125 
#
125 
#   Options derived from script directives
 126 
#   Options derived from script directives
126 
#
 127 
#
127 
my $opt_description;
 128 
my $opt_description;
Line 179... Line 180...
179 
                "PackagePkgDir=s"   => \$opt_pkgpkgdir,
 180 
                "PackagePkgDir=s"   => \$opt_pkgpkgdir,
180 
                "Output=s"          => \$opt_output,
 181 
                "Output=s"          => \$opt_output,
181 
                "tarFile=s"         => \$opt_tarFile,
 182 
                "tarFile=s"         => \$opt_tarFile,
182 
                "Variant:s"         => \$opt_variant,
 183 
                "Variant:s"         => \$opt_variant,
183 
                "PkgArch:s"         => \$opt_pkgarch,
 184 
                "PkgArch:s"         => \$opt_pkgarch,
- 
 
 185 
                "NoArch"            => \$opt_noarch,
184 
    );
 186 
    );
185 
    $opt_verbose++ unless ( $opt_vargs eq '@' );
 187 
    $opt_verbose++ unless ( $opt_vargs eq '@' );
186 
 
 188 
 
187 
    ErrorConfig( 'name'    => 'DebianUtils',
 189 
    ErrorConfig( 'name'    => 'DebianUtils',
188 
                 'verbose' => $opt_verbose,
 190 
                 'verbose' => $opt_verbose,
Line 243... Line 245...
243 
 
 245 
 
244 
    #
 246 
    #
245 
    #   Defaults
 247 
    #   Defaults
246 
    #
 248 
    #
247 
    $opt_pkgarch = $opt_platform unless ( $opt_pkgarch );
 249 
    $opt_pkgarch = $opt_platform unless ( $opt_pkgarch );
- 
 
 250 
    $opt_pkgarch = 'all' if ( $opt_noarch );
248 
 
 251 
 
249 
    #
 252 
    #
250 
    #   Perform Clean up
 253 
    #   Perform Clean up
251 
    #   Invoked during "make clean" or "make clobber"
 254 
    #   Invoked during "make clean" or "make clobber"
252 
    #
 255 
    #
Line 263... Line 266...
263 
        rmtree ($opt_output) if ( -f $opt_output );
 266 
        rmtree ($opt_output) if ( -f $opt_output );
264 
        exit;
 267 
        exit;
265 
    }
 268 
    }
266 
 
 269 
 
267 
    #
 270 
    #
- 
 
 271 
    #   NoArch sanity test
- 
 
 272 
    #   MUST only build no-arch for production
- 
 
 273 
    #   User MUST do this in the build.pl file
- 
 
 274 
    #
- 
 
 275 
    if ($opt_noarch && $opt_type ne 'P')
- 
 
 276 
    {
- 
 
 277 
        Error ("Debian Packages marked as NoArch (all) must be built ONLY for production",
- 
 
 278 
               "This must be configured in the build.pl" );
- 
 
 279 
    }
- 
 
 280 
 
- 
 
 281 
    #
268 
    #   Clean  out the WORK directory
 282 
    #   Clean  out the WORK directory
269 
    #   Always start with a clean slate
 283 
    #   Always start with a clean slate
270 
    #
 284 
    #
271 
    #   Ensure that the base of the directory tree does not have 'setgid'
 285 
    #   Ensure that the base of the directory tree does not have 'setgid'
272 
    #       This will upset the debian packager
 286 
    #       This will upset the debian packager