Changeset 933 in ProjectBuilder

Timestamp:

Dec 5, 2009, 6:32:59 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Improves debian build (tab/space were mixed)

File:

• devel/pb/lib/ProjectBuilder/Env.pm (modified) (10 diffs)

devel/pb/lib/ProjectBuilder/Env.pm

@@ -68 +68 @@
 
 if (! -f $ENV{'PBETC'}) {
-    pb_log(0, "No existing $ENV{'PBETC'} found, creating one as template");
+    pb_log(0, "No existing $ENV{'PBETC'} found, creating one as template\n");
     open(PBRC, "> $ENV{'PBETC'}") || die "Unable to create $ENV{'PBETC'}";
     print PBRC << "EOF";
@@ -221 +221 @@
 if ($action =~ /^newproj$/) {
     if (! -d "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}") {
+        # TODO: There is also the need to do 
+        # svn import "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}" svn://repo
+        # in case it doesn't exist there
         pb_mkdir_p("$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}") || die "Unable to recursively create $ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";
     }
@@ -309 +312 @@
 
         # List of pkg to build by default (mandatory)
+        # TODO: projtag could be with a 1 default value
         my ($defpkgdir,$pbpackager, $pkgv, $pkgt) = pb_conf_get("defpkgdir","pbpackager","projver","projtag");
         # List of additional pkg to build when all is called (optional)
@@ -558 +562 @@
 
 # PBDESC contains the description of the package
-#filter PBDESC = "Bla-Bla"
+#filter PBDESC = Bla-Bla
 
 # PBSUMMARY contains a short single line description of the package
-#filter PBSUMMARY = "Bla"
+#filter PBSUMMARY = Bla
 
 # PBURL contains the URL of the Web site of the project
@@ -785 +789 @@
                 open(CONF,"> $ENV{'PBROOTDIR'}/$pp/deb/compat") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/deb/compat";
                 print CONF << "EOF";
-DBDEBCOMP
+PBDEBCOMP
 EOF
                 close(CONF);
@@ -825 +829 @@
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
+    CFLAGS += -O0
 else
-        CFLAGS += -O2
+    CFLAGS += -O2
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-        INSTALL_PROGRAM += -s
+    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
+    dh_testdir
+
+    # Configure the package.
+    CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
  --mandir=\$${prefix}/share/man
 
@@ -846 +850 @@
 
 build-arch-stamp:  config.status
-        dh_testdir
-
-        # Compile the package.
-        $(MAKE)
-
-        touch build-stamp
+    dh_testdir
+
+    # Compile the package.
+    $(MAKE)
+
+    touch build-stamp
 
 # Build architecture independent
@@ -857 +861 @@
 
 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
+    # 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
+    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
+    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
+    cp -f /usr/share/misc/config.guess config.guess
 endif
 
-        dh_clean
+    dh_clean
 
 # Install architecture dependent and independent
@@ -884 +888 @@
 # 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
+    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)/usr/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
+    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
@@ -909 +912 @@
 # 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
+    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
+    $(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
+    $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
 # Build architecture depdendent and independent packages