Permalink
Browse files

Item14317: fixed packaging; removed bogus plugin

  • Loading branch information...
MichaelDaum committed Feb 6, 2017
1 parent 5eec0de commit 64f00248e3129b88f184db9c5ace8987f50ede43
@@ -1,9 +1,6 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1437500521" format="1.1" version="1"}%
----+!! !%TOPIC%
-<!--
- * Set SHORTDESCRIPTION = %$SHORTDESCRIPTION%
--->
-%SHORTDESCRIPTION%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1486386256" format="1.1" version="1"}%
+---+!! %TOPIC%
+%FORMFIELD{"Description"}%
%TOC%
@@ -16,25 +13,23 @@ See http://www.appelsiini.net/projects/jeditable for more information.
%$INSTALL_INSTRUCTIONS%
-With JQueryPlugin versions *before* 4.02, you will have to enable the JEditableContribPlugin.
+---++ Dependencies
+%$DEPENDENCIES%
----++ Info
+---++ Change History
-| Change History: | <!-- versions below in reverse order -->&nbsp; |
-| 1.71 | Foswikitask:Item12864: Use simple decimal VERSION strings |
+%TABLE{columnwidths="7em" tablewidth="100%"}%
+| 1.72 | Foswikitask:Item14317 - fixed packaging, removed bogus <nop>JEditableContribPlugin |
+| 1.71 | Foswikitask:Item12864 - Use simple decimal VERSION strings |
| 1.7.1 | Initial release |
-| Dependencies: | %$DEPENDENCIES% |
-
-<!-- Do _not_ attempt to edit this topic; it is auto-generated. -->
%META:FORM{name="PackageForm"}%
%META:FIELD{name="Author" title="Author" value="Crawford Currie http://c-dot.co.uk"}%
%META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
%META:FIELD{name="Release" title="Release" value="%25$RELEASE%25"}%
+%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
-%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2011-2015 Foswiki Contributors"}%
+%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2011-2017 Foswiki Contributors"}%
%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
-%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/JEditableContrib"}%
-%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/JEditableContrib"}%
-%META:FILEATTACHMENT{name="jquery.jeditable.js" attr="h" comment="" date="1437500521" size="7945" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="jquery.jeditable_src.js" attr="h" comment="" date="1437500521" size="24351" user="ProjectContributor" version="1"}%
+%META:FIELD{name="Home" title="Home" value="https://foswiki.org/Extensions/JEditableContrib"}%
+%META:FIELD{name="Support" title="Support" value="https://foswiki.org/Support/JEditableContrib"}%
@@ -1,10 +1,11 @@
+# See bottom of file for license and copyright information
package Foswiki::Contrib::JEditableContrib;
use strict;
use warnings;
-our $VERSION = '1.71';
-our $RELEASE = '1.7.1'; # keep in synch with jquery.jeditable.js
+our $VERSION = '1.72';
+our $RELEASE = '06 Feb 2017';
our $SHORTDESCRIPTION =
'The JQuery "JEditable" plugin, packaged for use in Foswiki';
@@ -39,7 +40,7 @@ Author: Crawford Currie http://c-dot.co.uk
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
-Copyright (C) 2011-2015 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2011-2017 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
@@ -1,19 +1,34 @@
+# See bottom of file for license and copyright information
package Foswiki::Contrib::JEditableContrib::JEDITABLE;
+
use strict;
use warnings;
-use Assert;
-
use Foswiki::Plugins::JQueryPlugin ();
our @ISA = qw( Foswiki::Plugins::JQueryPlugin::Plugin );
use Foswiki::Plugins::JQueryPlugin::Plugin ();
use Foswiki::Contrib::JEditableContrib ();
+=begin TML
+
+---+ package Foswiki::Contrib::JEditableContrib::JEDITABLE
+
+This is the perl stub for the jeditable plugin.
+
+=cut
+
+=begin TML
+
+---++ ClassMethod new( $class, ... )
+
+Constructor
+
+=cut
+
sub new {
- my $class = shift;
+ my $class = shift;
my $session = shift || $Foswiki::Plugins::SESSION;
- my $src = (DEBUG) ? '_src' : '';
my $this = $class->SUPER::new(
$session,
@@ -24,10 +39,32 @@ sub new {
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JEditableContrib',
documentation => "$Foswiki::cfg{SystemWebName}.JEditableContrib",
summary => $Foswiki::Contrib::JEditableContrib::SHORTDESCRIPTION,
- javascript => ["jquery.jeditable${src}.js"]
+ javascript => ["jquery.jeditable.js"]
);
return $this;
}
1;
+
+__END__
+Foswiki - The Free and Open Source Wiki, http://foswiki.org/
+
+Copyright (C) 2010-2017 Foswiki Contributors. Foswiki Contributors
+are listed in the AUTHORS file in the root of this distribution.
+NOTE: Please extend that file, not this notice.
+
+Additional copyrights apply to some or all of the code in this
+file as follows:
+
+This program 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; either version 2
+of the License, or (at your option) any later version. For
+more details read LICENSE in the root of this distribution.
+
+This program 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.
+
+As per the GPL, removal of this notice is prohibited.
@@ -1,8 +1,8 @@
-# Release manifest for JEditableContrib
data/System/JEditableContrib.txt 0644 Documentation
lib/Foswiki/Contrib/JEditableContrib.pm 0644 Perl module
lib/Foswiki/Contrib/JEditableContrib/JEDITABLE.pm 0644 Perl module
lib/Foswiki/Contrib/JEditableContrib/Config.spec 0644 Configuration info
-lib/Foswiki/Plugins/JEditableContribPlugin.pm 0644 Plugin stub
-pub/System/JEditableContrib/jquery.jeditable_src.js 0644
+pub/System/JEditableContrib/Makefile 0644
+pub/System/JEditableContrib/jquery.jeditable.uncompressed.js 0644
pub/System/JEditableContrib/jquery.jeditable.js 0644
+pub/System/JEditableContrib/jquery.jeditable.js.gz 0644
@@ -1,27 +1,10 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
BEGIN { unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} ); }
use Foswiki::Contrib::Build;
# Create the build object
$build = new Foswiki::Contrib::Build('JEditableContrib');
-# (Optional) Set the details of the repository for uploads.
-# This can be any web on any accessible Foswiki installation.
-# These defaults will be used when expanding tokens in .txt
-# files, but be warned, they can be overridden at upload time!
-
-# name of web to upload to
-$build->{UPLOADTARGETWEB} = 'Extensions';
-
-# Full URL of pub directory
-$build->{UPLOADTARGETPUB} = 'http://foswiki.org/pub';
-
-# Full URL of bin directory
-$build->{UPLOADTARGETSCRIPT} = 'http://foswiki.org/bin';
-
-# Script extension
-$build->{UPLOADTARGETSUFFIX} = '';
-
# Build the target on the command line, or the default target
$build->build( $build->{target} );
@@ -1,37 +0,0 @@
-package Foswiki::Plugins::JEditableContribPlugin;
-
-use strict;
-use warnings;
-
-use Foswiki::Plugins::JQueryPlugin::Plugins ();
-use Foswiki::Contrib::JEditableContrib::JEDITABLE ();
-
-our $NO_PREFS_IN_TOPIC = 1;
-
-sub initPlugin {
- Foswiki::Plugins::JQueryPlugin::registerPlugin( 'JEditable',
- 'Foswiki::Contrib::JEditableContrib::JEDITABLE' );
- Foswiki::Plugins::JQueryPlugin::createPlugin('JEditable');
-}
-
-1;
-__END__
-Author: Crawford Currie http://c-dot.co.uk
-
-Foswiki - The Free and Open Source Wiki, http://foswiki.org/
-
-Copyright (C) 2011 Foswiki Contributors. Foswiki Contributors
-are listed in the AUTHORS file in the root of this distribution.
-NOTE: Please extend that file, not this notice.
-
-This program 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; either version 2
-of the License, or (at your option) any later version. For
-more details read LICENSE in the root of this distribution.
-
-This program 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.
-
-As per the GPL, removal of this notice is prohibited.
@@ -0,0 +1,5 @@
+FOSWIKI_ROOT?=~/foswiki/trunk/core
+TARGET=jquery.jeditable.js
+
+-include $(FOSWIKI_ROOT)/pub/System/JQueryPlugin/Makefile.include
+

0 comments on commit 64f0024

Please sign in to comment.