Commits

Rodrigo Bistolfi committed 4f9d98c

Added patch from uelsk8s:
- Implemented support for waf build system.
- Added documentation for waf.
- Renamed --without_config to --no-configure.
- Fixed documentation for --no-configure.
- Disable certificate checking in wget.

  • Participants
  • Parent commits 6dea367

Comments (0)

Files changed (3)

File usr/bin/sbbuilder

 
 =item B<--type=>string
 
-Type of SlackBuild.  There are 5 types of SlackBuilds :
+Type of SlackBuild.  There are 6 types of SlackBuilds :
 
 I<normal> . Default configure; make and make install flags. 
 
 
 I<cmake> . Use cmake instead GNU autoconf.
 
+I<waf> . Use waf instead GNU autoconf.
+
 =item B<--link=>string
 
 Enter a download link if you know where you can find the source tarball.
 
 Example: sbbuilder --link=http://foobar.com/foo-2.3.tar.gz --exclude="package_name >= 1.0-i586-1vl60"
 
-=item B<--noconfig>
+=item B<--no-configure>
 
 Do not include the execution of a configure script.
 
 	"help"		      => \$help,
 	"add=s"		      => \$add,
 	"exclude=s"	      => \$exclude,
-	"without_config"      => \$noconfig,
+	"no-configure"        => \$noconfig,
 	"xdesktop"	      => \$xdesktop);
 
 my $message_text = "\nVectorLinux SlackBuild Builder.\n";
 mkdir "$package" or warn "$!. Failed creating top dir.\n";
 mkdir "$package/$version" or warn "$!. Failed creating version folder.\n";
 mkdir "$package/$version/src" or warn "$!. Failed creating src folder.\n";
+mkdir "$package/$version/src/patches" or warn "$!. Failed creating patches folder.\n";
 chdir "$package/$version/src" or die $!;
 open my $fh, "+>$package.SlackBuild" or die $!;
 print $fh $sbText;
 close $fh;
+chmod(0777, "$package.SlackBuild") or warn "$!. Failed chmod on SlackBuild";
 
 # vim: set tabstop=4 shiftwidth=4 foldmethod=marker : ##

File usr/share/sbb/template/main.template

 [% PROCESS configure.python %]
 [% CASE 'cmake' %]
 [% PROCESS configure.cmake %]
+[% CASE 'waf' %]
+[% PROCESS configure.waf %]
 [% CASE 'custom' %]
 [% PROCESS configure.custom %]
 [% CASE %]

File usr/share/sbb/template/pkgsetup

 for SRC in $(echo $LINK);do
 if [ ! -f $CWD/$(basename $SRC) ]
 then
-        wget -c $SRC
+        wget --no-check-certificate -c $SRC
 fi
 done
 #--------------------------------------------
 #-----------------------------------------------------
 echo "Extracting source..."
 tar xvf $CWD/$NAME-$VERSION.tar.* || exit 1
+#this moves whatever was extracted to the std dirname we are expecting
+mv * $NAME-$VERSION 
 #-----------------------------------------------------