From: Andrew DeFaria Date: Thu, 10 Oct 2013 23:58:54 +0000 (-0700) Subject: Changed to use git backend X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=260517db1e32c14f15222d7b9073ed2c33081e62;hp=-c;p=clearscm.git Changed to use git backend --- 260517db1e32c14f15222d7b9073ed2c33081e62 diff --git a/web/Resumes/Andrew/index.php b/web/Resumes/Andrew/index.php index ab7061f..e2e077c 100644 --- a/web/Resumes/Andrew/index.php +++ b/web/Resumes/Andrew/index.php @@ -184,10 +184,10 @@ function stoptimer () {

Worked as a Clearquest Designer and hook code writer. The Clearquest database used Visual Basic. Implemented fixed and feature development for Clearquest as well as wrote several Perl scripts to perform data maintenance as - required by utilizing ClearSCM's Clearquest - module. Also utilized Clearquest::Server, - Clearquest::Client - and Clearquest::REST modules.

+ required by utilizing ClearSCM's Clearquest + module. Also utilized Clearquest::Server, + Clearquest::Client + and Clearquest::REST modules.

Worked with Electric Commander migrating a group from their unsupported build environment into @@ -196,7 +196,7 @@ function stoptimer () { Builds were down using Visual Studio 8.0, 9.0 and 10.0. Build system also used Perforce and Perforce trigger to fire builds as the engineers checked in code.

-

Implemented Perl module, Clearquest::REST, +

Implemented Perl module, Clearquest::REST, to replace a Clearquest Daemon that was in use so that systems that did not have Clearquest installed (e.g. Linux build machines) could talk to Clearquest to update defects when required. @@ -237,7 +237,7 @@ function stoptimer () {

Performed Clearcase/Clearquest administration with an emphasis on UCM administration. Wrote several Perl scripts including an Evil Twin + href="http://clearscm.com/php/scm_man.php?file=cc/etf.pl">Evil Twin Finder. Created UCM Projects and streams as appropriate as well as created and updated Build Forge jobs to automate work flow. Assisted in consultations with UCM concepts such as diff --git a/web/clearcase/triggers.php b/web/clearcase/triggers.php index 45b832c..f186f3b 100644 --- a/web/clearcase/triggers.php +++ b/web/clearcase/triggers.php @@ -53,7 +53,7 @@ Removes empty branches.

  • mktriggers.pl: Make triggers.
    • + href="/php/scm_man.php?file=cc/mktriggers.pl">mktriggers.pl: Make triggers. diff --git a/web/gitweb b/web/gitweb new file mode 120000 index 0000000..1729faf --- /dev/null +++ b/web/gitweb @@ -0,0 +1 @@ +/usr/share/gitweb \ No newline at end of file diff --git a/web/php/clearscm.php b/web/php/clearscm.php index 5b4bf11..d59f2e7 100644 --- a/web/php/clearscm.php +++ b/web/php/clearscm.php @@ -12,6 +12,8 @@ // (c) Copyright 2007, ClearSCM Inc., all rights reserved // //////////////////////////////////////////////////////////////////////////////// +include_once "scm.php"; + $base = $_SERVER['DOCUMENT_ROOT']; function menu_css () { @@ -63,9 +65,9 @@ function menu () {
    @@ -81,11 +83,11 @@ function menu () { -
  • CVS +
  • Git
    @@ -184,12 +186,11 @@ function copyright ($start_year = "", $email = "info@clearscm.com", $home = "") { global $base; - global $base1; $today = getdate (); $current_year = $today ["year"]; - $this_file = $base1 . "/" . $_SERVER['PHP_SELF']; + $this_file = $base . "/" . $_SERVER['PHP_SELF']; $mod_time = date ("F d Y @ g:i a", filemtime ($this_file)); @@ -209,20 +210,6 @@ $current_year, ClearSCM Inc. - All rights reserved END; } // copyright -function get_file_from_cvs ($file, - $machine = "clearscm.com", - $port = ":8080", - $path = "/viewvc/clearscm.com/") { - $user = "andrew"; - $password = "airafed"; - $url = "http://$user:$password@$machine$port$path$file?view=co"; - - $contents = @file ($url) - or die ("$url not found"); - - return $contents; -} # get_file_from_cvs - function display_contents_as_code ($contents) { print "
    "; print ""; @@ -278,14 +265,10 @@ function display_code ($file, $machine = "clearscm.com", $port = ":8080", $path = "/viewvc/clearscm.com/") { - display_contents_as_code (get_file_from_cvs ($file, $machine, $port, $path)); + display_contents_as_code (getSCMFile ($file)); } # display_code -function cvs_man ($file, - $machine = "clearscm.com", - $port = ":8080", - $path = "/viewvc/clearscm.com/") { - +function scm_man ($file) { $desc_spec = array ( 0 => array ("pipe", "r"), // stdout 1 => array ("pipe", "w"), // stdin @@ -302,7 +285,7 @@ function cvs_man ($file, $stdout = $pipes [1]; $stderr = $pipes [2]; - $contents = get_file_from_cvs ($file, $machine, $port, $path); + $contents = getSCMFile ($file); // Write to stdin foreach ($contents as $line) { @@ -310,13 +293,10 @@ function cvs_man ($file, } // foreach fclose ($stdin); - $end_of_index = 0; - $pre_just_ended = 0; - $machine = "clearscm.com"; - $port = ""; - $path = "/viewvc/clearscm.com/"; - $url = "http://$machine$port$path$file?view=co"; - $history = "http://$machine$port$path$file"; + $end_of_index = 0; + $pre_just_ended = 0; + $url = "/gitweb/?p=.git;a=blob_plain;f=$file;hb=HEAD"; + $history = "/gitweb/?p=.git;a=history;f=$file;hb=HEAD"; // Now get the output and write it out while (!feof ($stdout)) { @@ -383,13 +363,8 @@ function cvs_man ($file, } // while fclose ($stdout); - - //while (!feof ($stderr)) { - // echo fgets ($stderr) . "
    "; - //} // while - fclose ($stderr); proc_close ($pod2html); -} // cvs_man +} // scm_man ?> diff --git a/web/php/cvs_man.php b/web/php/cvs_man.php deleted file mode 100644 index e4f6196..0000000 --- a/web/php/cvs_man.php +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - ClearSCM: <?php echo $cvs_file?> - - - - - - - - - -
    - - -
    -
    - -
    -
    - - - - - diff --git a/web/php/scm.php b/web/php/scm.php new file mode 100644 index 0000000..15ba134 --- /dev/null +++ b/web/php/scm.php @@ -0,0 +1,23 @@ + diff --git a/web/php/scm_man.php b/web/php/scm_man.php new file mode 100644 index 0000000..bde9778 --- /dev/null +++ b/web/php/scm_man.php @@ -0,0 +1,42 @@ + + + + + + + ClearSCM: <?php echo $file?> + + + + + + + + + +
    + + +
    +
    + +
    +
    + + + + + diff --git a/web/scripts/perl.php b/web/scripts/perl.php index b9f64e1..bf9c059 100644 --- a/web/scripts/perl.php +++ b/web/scripts/perl.php @@ -47,43 +47,43 @@ href="/clearlib.tar.gz">clearlib.tar.gz and they are desribed here:

    -
    CmdLine.pm
    +
    CmdLine.pm
    Adds command history stack to command line oriented programs
    -
    DateUtils.pm
    +
    DateUtils.pm
    Simple date/time utilities
    -
    Display.pm
    +
    Display.pm
    Simple and consistant display routines for Perl
    -
    GetConfig.pm
    +
    GetConfig.pm
    Simple config file parsing
    -
    Logger.pm
    +
    Logger.pm
    Object oriented interface to handling logfiles
    -
    Mail.pm
    +
    Mail.pm
    A simplified approach to sending email
    -
    OSDep.pm
    +
    OSDep.pm
    Isolate OS dependencies
    -
    Rexec.pm
    +
    Rexec.pm
    Execute commands remotely
    -
    TimeUtils.pm
    +
    TimeUtils.pm
    Time utilities
    -
    Utils.pm
    +
    Utils.pm
    Simple and often used utilities
    @@ -94,35 +94,35 @@ please contact us.

    -
    Clearcase.pm
    +
    Clearcase.pm
    Object oriented interface to Clearcase
    -
    Clearcase::Vobs.pm
    +
    Clearcase::Vobs.pm
    Object oriented interface to Clearcase VOBs
    -
    Clearcase::Vob.pm
    +
    Clearcase::Vob.pm
    Object oriented interface to a Clearcase VOB
    -
    Clearcase::Views.pm
    +
    Clearcase::Views.pm
    Object oriented interface to Clearcase Views
    -
    Clearcase::View.pm
    +
    Clearcase::View.pm
    Object oriented interface to a Clearcase View
    -
    Clearcase::Element.pm
    +
    Clearcase::Element.pm
    Object oriented interface to a Clearcase Element
    -
    Clearcase::UCM::Activity.pm
    +
    Clearcase::UCM::Activity.pm
    Object oriented interface to a Clearcase UCM Activity
    -
    Clearcase::UCM::Stream.pm
    +
    Clearcase::UCM::Stream.pm
    Object oriented interface to a Clearcase UCM Stream
    @@ -133,26 +133,26 @@ please contact us.

    -
    Clearquest.pm
    +
    Clearquest.pm
    Object oriented interface to Clearquest
    -
    Clearquest::Client.pm
    +
    Clearquest::Client.pm
    Client interface to Clearquest Daemon
    -
    Clearquest::DBService.pm
    +
    Clearquest::DBService.pm
    Clearquest Database Service module
    -
    Clearquest::LDAP.pm
    +
    Clearquest::LDAP.pm
    Interface to LDAP info for Clearquest
    -
    Clearquest::Server.pm
    +
    Clearquest::Server.pm
    Clearquest Server Module
    -
    Clearquest::REST.pm
    +
    Clearquest::REST.pm
    Clearquest REST Module