Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item13762: replace subversion with git
  • Loading branch information
MichaelDaum committed Sep 29, 2015
1 parent 1f82ab0 commit f4244f5
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
28 changes: 14 additions & 14 deletions BuildContrib/data/System/BuildContrib.txt
@@ -1,10 +1,10 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1443271504" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1443532867" format="1.1" version="1"}%
%META:TOPICPARENT{name="Contribs"}%
---+!! Foswiki Developer Environment
<a href="http://wikiring.com" class="foswikiRight"><img src="%ATTACHURLPATH% \logo.gif" title="WikiRing: Professional Wiki Innovation and Support" /></a>

%FORMFIELD{"Description"}%


%TOC%

---++ Summary of Contents
Expand Down Expand Up @@ -402,7 +402,7 @@ MANIFESTs can also include other extensions that have been packaged using

This will include the !WysiwygPlugin in the release package.

Note that there is a script in the Foswiki =tools= directory called =check_manifest.pl= that can be run at any time to check the contents of your MANIFEST against what is checked into Subversion.
Note that there is a script in the Foswiki =tools= directory called =check_manifest.pl= that can be run at any time to check the contents of your MANIFEST against what is checked into git.

---+++++ =!include= _&lt;path to extension MANIFEST* file &gt;_
When the target is a file, and not a directory, !BuildContrib will recursively
Expand Down Expand Up @@ -504,7 +504,7 @@ The easiest way to write a new build script is to use the
=create_new_extension.pl= script, which is part of the !BuildContrib.
1 Create your plugin source tree
* =perl create_new_extension.pl !BathPlugin=
* if you are working in a Subversion checkout, move the directory just created up one level to be at the same level as =core=.
* if you are working in a git checkout, move the directory just created up one level to be at the same level as =core=.
1 Edit =lib/Foswiki/Plugins/BathPlugin.pm= as required to create your
plugin functionality
1 Edit =lib/Foswiki/Plugins/BathPlugin/MANIFEST= and make sure it lists
Expand Down Expand Up @@ -650,21 +650,21 @@ You are strongly recommended to use this Contrib to help split your code develop

%$INSTALL_INSTRUCTIONS%

---++ Contrib Info
---++ Info
Another great Foswiki extension from the <a style="text-decoration:none" href="http://wikiring.com"><img src="%ATTACHURLPATH% \wikiringlogo20x20.png" alt="" /> *WikiRing* </a> - __Working together to improve your wiki experience__!

See the repository for full change history.


%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1443532867" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="logo.gif" attr="" comment="logo" date="1443532867" size="14169" user="ProjectContributor" version="1"}%
%META:FORM{name="PackageForm"}%
%META:FIELD{name="Author" title="Author" value="[[http://c-dot.co.uk][Crawford Currie]]"}%
%META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
%META:FIELD{name="Copyright" title="Copyright" value="Foswiki Contributors 2004-2015, All Rights Reserved"}%
%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/BuildContrib"}%
%META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Release" title="Release" value="%25$RELEASE%25"}%
%META:FIELD{name="Description" title="Release" value="%25$SHORTDESCRIPTION%25"}%
%META:FIELD{name="Copyright" value="Foswiki Contributors 2004-2015, All Rights Reserved"}%
%META:FIELD{name="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Repository" value="https://github.com/foswiki/distro"}%
%META:FIELD{name="Home" value="http://foswiki.org/Extensions/BuildContrib"}%
%META:FIELD{name="Support" value="http://foswiki.org/Support/BuildContrib"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1443271504" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="logo.gif" attr="" comment="logo" date="1443271504" size="14169" user="ProjectContributor" version="1"}%
%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/BuildContrib"}%
%META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
4 changes: 2 additions & 2 deletions BuildContrib/lib/Foswiki/Contrib/Build.pm
Expand Up @@ -120,11 +120,11 @@ BEGIN {

my $env = $ENV{'FOSWIKI_LIBS'};
die <<ARGH unless $env;
We don't seem to be building in a configured subversion checkout, and
We don't seem to be building in a configured git checkout, and
FOSWIKI_LIBS is not defined. I cannot determine how to find the Foswiki
libraries required to support the build system.
BuildContrib must either be run within a full subversion checkout
BuildContrib must either be run within a full git checkout
that has both LocalLib.cfg and LocalSite.cfg, or the environment variable
FOSWIKI_LIBS must point to a configured Foswiki.
Expand Down
Expand Up @@ -20,10 +20,10 @@ use strict;
=begin TML
#HistoryTarget
Updates the history in the plugin/contrib topic from the subversion checkin history.
Updates the history in the plugin/contrib topic from the git checkin history.
* Requires a line like | Change History:| NNNN: descr | in the topic, where NNN is an SVN rev no and descr is the description of the checkin.
* Automatically changes ItemNNNN references to links to the bugs web.
* Must be run in a subversion checkout area!
* Must be run in a git checkout area!
This target works in the current checkout area; it still requires a checkin of the updated plugin. Note that history items checked in against Item000 are *ignored* (not included in the history).
=cut
Expand Down
Expand Up @@ -405,7 +405,7 @@ sub _uploadTopic {
$form->{text} = <<EXTRA. $form->{text};
<!--
This topic is part of the documentation for $this->{project} and is
automatically generated from Subversion. You can edit it, but if you do,
automatically generated from git. You can edit it, but if you do,
please make sure the maintainer of the extension knows about your changes,
otherwise your edits might be lost the next time the topic is uploaded.
Expand Down

0 comments on commit f4244f5

Please sign in to comment.