Changeset 273

Timestamp:

11/08/07 23:57:12 (6 years ago)

Author:

bruno

Message:

pb_env_init now creates a pbconf template dir if asked for (newproj option)

Location:

devel/pb

Files:

• bin/pb (modified) (4 diffs)
• lib/ProjectBuilder/Base.pm (modified) (5 diffs)
• lib/ProjectBuilder/Changelog.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -101 +101 @@
 
 my ($pbrc, $filteredfiles, $defpkgdir, $extpkgdir);
+my $pbinit = undef;
+$pbinit = 1 if ($action =~ /^newproj$/);
 
 # Handles project name if any
@@ -106 +108 @@
 if (defined $opts{'p'}) {
     ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $defpkgdir, $extpkgdir) 
-    = pb_env_init($opts{'p'});
+    = pb_env_init($opts{'p'},$pbinit);
 } else {
     ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $defpkgdir, $extpkgdir) 
-    = pb_env_init();
+    = pb_env_init(undef,$pbinit);
 }
 
@@ -147 +149 @@
 } elsif ($action =~ /^newvm$/) {
     pb_launchvm($ENV{'PBVM'},1);
+} elsif ($action =~ /^newproj$/) {
+    # Nothing to do - already done in pb_env_init
 } elsif ($action =~ /^clean$/) {
 } else {
@@ -910 +914 @@
     print "\t           from the current one                        \n";
     print "\n";
-}
+    print "\tnewproj:   Create a new project and a template set of  \n";
+    print "\t           configuration files under pbconf            \n";
+    print "\n";
+}

devel/pb/lib/ProjectBuilder/Base.pm

@@ -20 +20 @@
 sub pb_env_init {
 
-my $proj=shift;
+my $proj=shift || undef;
+my $pbinit=shift || undef;
 my $ver;
 my $tag;
@@ -57 +58 @@
 # Set delivery directory
 #
+if (not defined ($pbrc{$proj})) {
+    die "Please create a pbrc reference for project $proj in $ENV{'PBETC'}\n";
+}
+
 my $topdir=dirname($pbrc{$proj});
 # Expand potential env variable in it
@@ -82 +87 @@
 #
 $ENV{'PBCONF'} = "$ENV{'PBROOT'}/pbconf";
+if (defined $pbinit) {
+    print $LOG "Creating $ENV{'PBCONF'} directory\n";
+    pb_mkdir_p("$ENV{'PBCONF'}");
+    }
 die "Project $proj not Project-Builder compliant. Please populate $ENV{'PBCONF'}" if ( not -d "$ENV{'PBCONF'}");
 
@@ -89 +98 @@
 my %filteredfiles = ();
 
-if (-f "$ENV{'PBCONF'}/$proj.pb") {
+if ((-f "$ENV{'PBCONF'}/$proj.pb") and (not defined $pbinit)) {
     # List of pkg to build by default (mandatory)
     # List of additional pkg to build when all is called (optional)
@@ -129 +138 @@
     die "Invalid tag name $ENV{'PBTAG'} in $ENV{'PBCONF'}/$proj.pb" if ($ENV{'PBTAG'} !~ /[0-9.]+/);
 } else {
-    die "Unable to open $ENV{'PBCONF'}/$proj.pb";
+    if (defined $pbinit) {
+        open(CONF,"> $ENV{'PBCONF'}/$proj.pb") || die "Unable to create $ENV{'PBCONF'}/$proj.pb";
+        print CONF << "EOF";
+#
+# Project Builder configuration file
+# For project $proj
+#
+# \$Id\$
+#
+
+#
+# Which CMS system is used (Subversion, CVS or tar file content extracted)
+#
+#cms $proj = svn
+#cms $proj = cvs
+#cms $proj = flat
+
+#
+# Packager label
+#
+#packager $proj = "William Porte <bill\@$proj.org>"
+#
+
+# For delivery to a machine by SSH (potentially the FTP server)
+# Needs hostname, account and directory
+#
+#sshhost $proj = www.$proj.org
+#sshlogin $proj = bill
+#sshdir $proj = /$proj/ftp
+#sshport $proj = 22
+
+#
+# For Virtual machines management
+# Naming convention to follow: distribution name (as per ProjectBuilder::Distribution)
+# followed by '_' and by release number
+# a .vmtype extension will be added to the resulting string
+# a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
+#
+#vmlist pb = mandrake_10.1,mandrake_10.2,mandriva_2006.0,mandriva_2007.0,mandriva_2007.1,mandriva_2008.0,redhat_7.3,redhat_9,fedora_4,fedora_5,fedora_6,fedora_7,rhel_3,rhel_4,rhel_5,suse_10.0,suse_10.1,suse_10.2,suse_10.3,sles_9,sles_10,gentoo_nover,debian_3.1,debian_4.0,ubuntu_6.06,ubuntu_7.04,ubuntu_7.10
+
+#
+# Valid values for vmtype are
+# qemu, (vmware, xen, ... TBD)
+#vmtype $proj = qemu
+
+# Hash for VM stuff on vmtype
+#vmntp default = pool.ntp.org
+
+# We suppose we can commmunicate with the VM through SSH
+#vmhost pb = localhost
+#vmlogin pb = pb
+#vmport pb = 2222
+
+# Timeout to wait when VM is launched/stopped
+#vmtmout default = 120
+
+# per VMs needed paramaters
+#vmopt pb = -m 384 -daemonize
+#vmpath pb = /home/qemu
+#vmsize pb = 5G
+
+#
+# Global version/tag for the project
+#
+#projver $proj = devel
+#projtag $proj = 1
+
+# Adapt to your needs:
+# Optional if you need to overwrite the global values above
+#
+#pkgver pkg1 = stable
+#pkgtag pkg1 = 3
+#pkgver nil
+#pkgtag nil
+
+# Hash of default package/package directory
+#defpkgdir pkg1 = pkg1dir
+
+# Hash of additional package/package directory
+#extpkgdir pkg1-doc = pkg1-docdir
+
+# Hash of valid version names
+#version devel
+#version stable
+
+# List of files per pkg on which to apply filters
+# Files are mentioned relatively to pbroot/defpkgdir
+#filteredfiles pkg1 = Makefile.PL
+#filteredfiles pkg1-doc = configure.in
+EOF
+        close(CONF);
+        pb_mkdir_p("$ENV{'PBCONF'}/pbfilter") || die "Unable to create $ENV{'PBCONF'}/pbfilter";
+        open(CONF,"> $ENV{'PBCONF'}/pbfilter/all.pbf") || die "Unable to create $ENV{'PBCONF'}/pbfilter/all.pbf";
+        print CONF << "EOF";
+#
+# \$Id\$
+#
+# Filter for all files
+#
+# PBSRC is replaced by the source package format
+#filter PBSRC = ftp://ftp.$proj.org/src/%{name}-%{version}.tar.gz
+
+# PBVER is replaced by the version (\$pbver in code)
+#filter PBVER = \$pbver
+
+# PBDATE is replaced by the date (\$pbdate in code)
+#filter PBDATE = \$pbdate
+
+# PBLOG is replaced by the changelog if value is yes
+#filter PBLOG = yes
+
+# PBTAG is replaced by the tag (\$pbtag in code)
+#filter PBTAG = \$pbtag
+
+# PBREV is replaced by the revision (\$pbrev in code)
+#filter PBREV = \$pbrev
+
+# PBPKG is replaced by the package name (\$pbpkg in code)
+#filter PBPKG = \$pbpkg
+
+# PBPACKAGER is replaced by the packager name (\$pbpackager in code)
+#filter PBPACKAGER = \$pbpackager
+
+# PBDESC contains the description of the package
+#filter PBDESC = "Bla-Bla"
+
+# PBURL contains the URL of the Web site of the project
+#filter PBURL = http://www.$proj.org
+EOF
+        close(CONF);
+        open(CONF,"> $ENV{'PBCONF'}/pbfilter/rpm.pbf") || die "Unable to create $ENV{'PBCONF'}/pbfilter/rpm.pbf";
+        print CONF << "EOF";
+#
+# \$Id\$
+#
+# Filter for rpm build
+#
+
+# PBGRP is replaced by the RPM group of apps
+#filter PBGRP = Applications/Archiving
+
+# PBDEP is replaced by the list of dependencies
+#filter PBDEP =
+
+# PBSUF is replaced by the package name (\$pbpkg in code)
+#filter PBSUF = \$pbsuf
+
+# PBOBS is replaced by the Obsolete line
+#filter PBOBS =
+
+EOF
+        close(CONF);
+        open(CONF,"> $ENV{'PBCONF'}/pbfilter/deb.pbf") || die "Unable to create $ENV{'PBCONF'}/pbfilter/deb.pbf";
+        print CONF << "EOF";
+#
+# \$Id\$
+#
+# Filter for debian build
+#
+# PBGRP is replaced by the group of apps
+#filter PBGRP = utils
+
+# PBVER is replaced by the version (\$pbver in code)
+#filter PBVER = \$pbver
+
+# PBDEP is replaced by the list of dependencies
+#filter PBDEP =
+
+# PBSUG is replaced by the list of suggestions
+#filter PBSUG =
+
+# PBREC is replaced by the list of recommandations
+#filter PBREC =
+
+# PBLOG is replaced by the changelog if value is yes
+#filter PBLOG = yes
+
+# PBPKG is replaced by the package name (\$pbpkg in code)
+#filter PBPKG = \$pbpkg
+
+# PBPACKAGER is replaced by the packager name (\$pbpackager in code)
+#filter PBPACKAGER = \$pbpackager
+
+EOF
+        close(CONF);
+        open(CONF,"> $ENV{'PBCONF'}/pbfilter/md.pbf") || die "Unable to create $ENV{'PBCONF'}/pbfilter/md.pbf";
+        print CONF << "EOF";
+# Specific group for Mandriva for $proj
+filter PBGRP = Archiving/Backup
+EOF
+        close(CONF);
+        open(CONF,"> $ENV{'PBCONF'}/pbfilter/novell.pbf") || die "Unable to create $ENV{'PBCONF'}/pbfilter/novell.pbf";
+        print CONF << "EOF";
+# Specific group for SuSE for $proj
+filter PBGRP = Productivity/Archiving/Backup
+EOF
+        close(CONF);
+        pb_mkdir_p("$ENV{'PBCONF'}/pkg1/deb") || die "Unable to create $ENV{'PBCONF'}/pkg1/deb";
+        open(CONF,"> $ENV{'PBCONF'}/pkg1/deb/control") || die "Unable to create $ENV{'PBCONF'}/pkg1/deb/control";
+        print CONF << "EOF";
+Source: PBPKG
+Section: PBGRP
+Priority: optional
+Maintainer: PBPACKAGER
+Build-Depends: debhelper (>= 4.2.20), PBDEP
+Standards-Version: 3.6.1
+
+Package: PBPKG
+Architecture: amd64 i386 ia64
+Section: PBGRP
+Priority: optional
+Depends: \${shlibs:Depends}, \${misc:Depends}, PBDEP
+Recommends: PBREC
+Suggests: PBSUG
+Description: 
+ PBDESC
+ .
+ Homepage: PBURL
+
+EOF
+        close(CONF);
+        open(CONF,"> $ENV{'PBCONF'}/pkg1/deb/copyright") || die "Unable to create $ENV{'PBCONF'}/pkg1/deb/copyright";
+        print CONF << "EOF";
+This package is debianized by PBPACKAGER
+`date`
+
+The current upstream source was downloaded from
+ftp://ftp.$proj.org/src/.
+
+Upstream Authors: Put their name here
+
+Copyright:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in /usr/share/common-licenses/GPL.
+
+EOF
+        close(CONF);
+        open(CONF,"> $ENV{'PBCONF'}/pkg1/deb/changelog") || die "Unable to create $ENV{'PBCONF'}/pkg1/deb/changelog";
+        print CONF << "EOF";
+PBLOG
+EOF
+        close(CONF);
+        open(CONF,"> $ENV{'PBCONF'}/pkg1/deb/compat") || die "Unable to create $ENV{'PBCONF'}/pkg1/deb/compat";
+        print CONF << "EOF";
+4
+EOF
+        close(CONF);
+        open(CONF,"> $ENV{'PBCONF'}/pkg1/deb/pkg1.dirs") || die "Unable to create $ENV{'PBCONF'}/pkg1/deb/pkg1.dirs";
+        print CONF << "EOF";
+EOF
+        close(CONF);
+        open(CONF,"> $ENV{'PBCONF'}/pkg1/deb/pkg1.docs") || die "Unable to create $ENV{'PBCONF'}/pkg1/deb/pkg1.docs";
+        print CONF << "EOF";
+INSTALL
+COPYING
+AUTHORS
+NEWS
+README
+EOF
+        close(CONF);
+        open(CONF,"> $ENV{'PBCONF'}/pkg1/deb/rules") || die "Unable to create $ENV{'PBCONF'}/pkg1/deb/rules";
+        print CONF << 'EOF';
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+#
+# $Id$
+#
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# Define package name variable for a one-stop change.
+PACKAGE_NAME = PBPKG
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O0
+else
+        CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+        INSTALL_PROGRAM += -s
+endif
+config.status: configure
+        dh_testdir
+
+        # Configure the package.
+        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
+ --mandir=\$${prefix}/share/man
+
+# Build both architecture dependent and independent
+build: build-arch build-indep
+
+# Build architecture dependent
+build-arch: build-arch-stamp
+
+build-arch-stamp:  config.status
+        dh_testdir
+
+        # Compile the package.
+        $(MAKE)
+
+        touch build-stamp
+
+# Build architecture independent
+build-indep: build-indep-stamp
+
+build-indep-stamp:  config.status
+        # Nothing to do, the only indep item is the manual which is available as html in original source
+        touch build-indep-stamp
+
+# Clean up
+clean:
+        dh_testdir
+        dh_testroot
+        rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+        # Clean temporary document directory
+        rm -rf debian/doc-temp
+        # Clean up.
+        -$(MAKE) distclean
+        rm -f config.log
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+        cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+        cp -f /usr/share/misc/config.guess config.guess
+endif
+
+        dh_clean
+
+# Install architecture dependent and independent
+install: install-arch install-indep
+
+# Install architecture dependent
+install-arch: build-arch
+        dh_testdir
+        dh_testroot
+        dh_clean -k -s
+        dh_installdirs -s
+
+        # Install the package files into build directory:
+        # - start with upstream make install
+        $(MAKE) install prefix=$(CURDIR)/debian/$(PACKAGE_NAME)/usr mandir=$(CURDIR)/debian/$(PACKAGE_NAME)/us
+r/share/man
+        # - copy html manual to temporary location for renaming
+        mkdir -p debian/doc-temp
+        dh_install -s
+
+# Install architecture independent
+install-indep: build-indep
+        dh_testdir
+        dh_testroot
+        dh_clean -k -i
+        dh_installdirs -i
+        dh_install -i
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+        dh_testdir
+        dh_testroot
+        dh_installchangelogs ChangeLog
+        dh_installdocs
+        dh_installman
+        dh_link
+        dh_strip
+        dh_compress
+        dh_fixperms
+        dh_installdeb
+        dh_shlibdeps
+        dh_gencontrol
+        dh_md5sums
+        dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+        $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Build architecture depdendent and independent packages
+binary: binary-arch binary-indep
+.PHONY: clean binary
+
+EOF
+        close(CONF);
+        pb_mkdir_p("$ENV{'PBCONF'}/pkg1/rpm") || die "Unable to create $ENV{'PBCONF'}/pkg1/rpm";
+        open(CONF,"> $ENV{'PBCONF'}/pkg1/rpm/pkg1.spec") || die "Unable to create $ENV{'PBCONF'}/pkg1/rpm/pkg1.spec";
+        print CONF << 'EOF';
+#
+# $Id$
+#
+
+Summary:        bla-bla
+Summary(fr):    french bla-bla
+
+Name:           PBPKG
+Version:        PBVER
+Release:        PBTAGPBSUF
+License:        GPL
+Group:          PBGRP
+Url:            PBURL
+Source:         PBSRC
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
+Requires:       PBDEP
+
+%description
+PBDESC
+
+%description -l fr
+french desc
+
+%prep
+%setup -q
+
+%build
+%configure
+make %{?_smp_mflags} VERSION=%{version}
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%doc ChangeLog
+%doc INSTALL COPYING README AUTHORS NEWS
+
+%changelog
+PBLOG
+
+EOF
+        close(CONF);
+        pb_mkdir_p("$ENV{'PBCONF'}/pkg1/pbfilter") || die "Unable to create $ENV{'PBCONF'}/pkg1/pbfilter";
+
+        print "\nDo not to forget to commit the pbconf directory in your CMS if needed\n";
+        print "After having renamed the pkg1 directory to your package's name      \n\n";
+    } else {
+        die "Unable to open $ENV{'PBCONF'}/$proj.pb";
+    }
 }
 

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -1 +1 @@
 #!/usr/bin/perl -w
 #
-# Creates changelog for packages from Changelog files in the apps
+# Creates all changelog for packages from a single Changelog files in pbconf
 #
 # $Id$