WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/jats_svnrelease.pl

+#
 #   Create a class to describe the complete SVN label
 #   This will parse the label and create a number of nice elements
+#
-my $svn_label = NewSessionByUrl ( $opt_spec[0] );
+my $svn_label = NewSessionByUrl ( $opt_spec[0], 1 );
+#
 #   Setup user specified workspace
 #   Include the user name to ensure that the view name is unique-ish
 #   Keep the name as short as possible as some compilers display a fixed
+    #
     #   Create a simple dir name
     #       Remove path sep characters and replace with _
     #       Remove Peg marker (@) as this breaks svn
     #       Replace multiple _ with a single _
+    #       Remove trailing _ - caused by URL with a trailing /
+    #
     $opt_viewname =~ s~[^\-.:0-9a-zA-Z_]~_~g;
     $opt_viewname =~ tr~_~_~s;
+    $opt_viewname =~ s~_+$~~;
+}
 $opt_viewname =~ s~^$view_prefix~~ if (defined($opt_viewname) && $view_prefix && $opt_delete );
+#
 #   Create a clearcase view to be used for the view
                             'old' => $view_tag,
                             'new' => $branch,
                             'comment' => 'Created by Jats SvnRelease branch request',
                             'replace' => 0 );
-        $view_tag = $svn_label->Url( $view_tag);
+        $view_tag = SvnPath2Url($view_tag);
+    }
     $svn_label->SvnCo ( $view_tag, $VIEWDIR . $opt_path );
     Error ("Cannot locate the created Workspace")
         unless ( -d $VIEWDIR . $opt_path);
+#
 sub delete_view
+{
     my $cofound = 0;
     my $uuid;
+    #
     #   Simple delete
+    #
     if ( $opt_extract_files )
+    {
         if ( -d $VIEWDIR )
+        {
             Message("Remove extracted files: $VIEWDIR");
-            rmtree( $VIEWDIR );
+            RmDirTree( $VIEWDIR );
+        }
+    }
     else
+    {
+        #
             SvnRmView ('path'     => $VIEWDIR . $opt_path,
                        'force'    => $opt_delete > 1,
                        'modified' => [ 'local_dpkg_archive' ] );
+        }
-        Error ("View was not deleted")
+        Error ("View was not deleted. Will Delete view directory")
             if ( -d $VIEWDIR . $opt_path );
-        rmtree( $VIEWDIR ) if $opt_path;
+        RmDirTree( $VIEWDIR ) if $opt_path;
+    }
     Error ("View was not deleted")
         if ( -d $VIEWDIR );
+}
+    #
     Verbose("Extracting files into $VIEWDIR");
     if ( -d $VIEWDIR )
+    {
         Verbose "Delete Directory: $VIEWDIR\n";
-        rmtree( $VIEWDIR );
+        RmDirTree( $VIEWDIR );
+    }
     $svn_label->SvnCo ( $svn_label->Full, $VIEWDIR, '--Export' );
+    #
 #   Documentation
+#
 =pod
+=for htmltoc    GENERAL::Subversion::
 =head1 NAME
 jats_svnrelease - Build a package given a SubVersion label
 =head1 SYNOPSIS
     -[mk]branch=xxx    - Will create a view with a branch rule
     -tag=xxx           - Compatability. Not used
     -extract           - Extract the view and exit
     -extractfiles      - Extract files, without a view
     -cache             - Refresh local dpkg_archive cache
-    -delete            - Remove any existing view and exit
+    -delete[=n]        - Remove any existing view and exit
     -debugOnly         - Make only the debug version
     -prodOnly          - Make only the production version
     -[no]dpkg          - Transfer package into dpkg_archive
     -[no]copy          - Transfer pkg directory to the current user directory
     -[no]reuse         - Reuse the view
 =item B<-view name>
 Specified an alternate view name and tag to be used. This option does not provide the
 full name of the view.
-    The view path will be: "${USER}_${NAME}"
+The view path will be: "${USER}_${NAME}"
 The default "NAME" is the first label specified with the repository and tag removed.
 If the user provides a view "name" that is prefixed with their user name
 ('${USER}_'), then the username will be stripped of for internal processing.
 command line. It overides the value of GBE_VIEWBASE.
 If the comamnd is invoked within a development sandbox, then the default
 location will be the root directory of the development sandbox.
-=back
 =item B<-branch=xxx or -mkbranch=xxx>
 This option will create workspace branch that is tagged with the named branch.
 This is intended to facilitate the maintenance of existing packages - the
 creation of a patch.
 The normal operation is to copy the packages, only if they do not already exist
 in the local cache. This option may be used to ensure that the local copy is
 correct and up to date.
-=item B<-delete>
+=item B<-delete[=level]>
 Delete the view used by the program, if it exists. This option may be used to
 cleanup after an error.
+The default 'level' is 1.
-Note: Ensure that no files are open in the view and that the users current
+If the delete level is 1, then ensure that no files are open in the view and
-working directory is not in the view as these will prevent the view from being
+that the users current working directory is not in the view as these will
-deleted.
+prevent the view from being deleted.
+If the delete level is greater than one, then the view will be deleted, even
+if there are checkout out files.
 =item B<-debugOnly>
 Make only the debug version of the package. The default it to create both the
 debug and production version of the package. The type of build may be  further
 This flag allows the view created by the program to be re-used.
 =over 8
+=item *
-=item 1. The view is not deleted before being populated.
+The view is not deleted before being populated.
-=item 2. The view will not be populated if it does exist.
+=item *
+The view will not be populated if it does exist.
+=item *
-=item 3. The view will not be deleted at the end the process.
+The view will not be deleted at the end the process.
 =back
 This option is useful for debugging a build process.
 Test the building of the package. This option implies "nocopy" and "nodpkg".
 =item B<-[no]keep>
-Keep the clearcase view after the build. The default option is "nokeep"
+Keep the workspace after the build. The default option is "nokeep"
 This option is different to the "reuse" in that the view will be deleted, if
 it exists, before the build, but will be retained at the completion of the
 process. The user may then manually extract the created package.
 various tests are performed to ensure the repeatability of the view and the
 build. These tests include:
 =over 8
+=item   *
-=item   * The view must be constructed from one label
+The view must be constructed from one label
+=item   *
+That label must be pegged
+=item   *
-=item   * That label must be pegged
+The labelled view must contain exactly one build file
-=item   * The labelled view must contain exactly one build file
+=item   *
-=item   * The view cannot have been re-used.
+The view cannot have been re-used.
 =back
 =item Locate build files

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/jats_svnrelease.pl – Rev 351 → 361