From f6053bc8aaa7962ca29829c78208d52f90c88484 Mon Sep 17 00:00:00 2001 From: Bartholdi Laurent Date: Thu, 3 Mar 2016 11:02:18 +0100 Subject: [PATCH] Cleaned up unnecessary defines: PATH@, VERSION@, DOC@ --- PackageInfo.g | 8 ++++---- gap/helpers.gi | 21 +-------------------- gap/vhgroup.gi | 4 +--- init.g | 4 +--- read.g | 8 +++----- 5 files changed, 10 insertions(+), 35 deletions(-) diff --git a/PackageInfo.g b/PackageInfo.g index df62a98..510f23a 100644 --- a/PackageInfo.g +++ b/PackageInfo.g @@ -5,11 +5,11 @@ SetPackageInfo( rec( PackageName := "fr", Subtitle := "Computations with functionally recursive groups", -Version := "2.3.3", -Date := "27/02/2016", +Version := "2.3.4", +Date := "03/03/2016", ## <#GAPDoc Label="Version"> -## -## +## +## ## <#/GAPDoc> ArchiveURL := Concatenation("https://github.com/gap-packages/fr/releases/download/v",~.Version,"/fr-",~.Version), ArchiveFormats := ".tar.gz", diff --git a/gap/helpers.gi b/gap/helpers.gi index 7171f88..f9141ce 100644 --- a/gap/helpers.gi +++ b/gap/helpers.gi @@ -2,7 +2,7 @@ ## #W helpers.gi Laurent Bartholdi ## -#Y Copyright (C) 2012-2013, Laurent Bartholdi +#Y Copyright (C) 2012-2016, Laurent Bartholdi ## ############################################################################# ## @@ -11,25 +11,6 @@ ## ############################################################################# -############################################################################# -## -#W Compile documentation -## -BindGlobal("PATH@", PackageInfo("fr")[1].InstallationPath); -VERSION@ := Filename(DirectoriesPackageLibrary("fr",""),".version"); -if VERSION@<>fail then - VERSION@ := ReadLine(InputTextFile(VERSION@)); - Remove(VERSION@); # remove \n -fi; -MakeReadOnlyGlobal("VERSION@"); - -BindGlobal("DOC@", function() MakeGAPDocDoc(Concatenation(PATH@,"/doc"),"fr", - ["../gap/frmachine.gd","../gap/frelement.gd","../gap/mealy.gd", - "../gap/group.gd","../gap/vector.gd","../gap/algebra.gd", - "../gap/examples.gd","../gap/helpers.gd","../gap/perlist.gd","../gap/cp.gd", - "../PackageInfo.g"],"fr","../../.."); # "http://www.gap-system.org/Manuals"); -end); - BindGlobal("INSTALLPRINTERS@", function(filter) InstallMethod(PrintObj, "(FR)", [filter], 2*SUM_FLAGS, function(x) Print(String(x)); end); InstallMethod(ViewObj, "(FR)", [filter], 2*SUM_FLAGS, function(x) Print(ViewString(x)); end); diff --git a/gap/vhgroup.gi b/gap/vhgroup.gi index b0d7551..858787c 100644 --- a/gap/vhgroup.gi +++ b/gap/vhgroup.gi @@ -2,9 +2,7 @@ ## #W vhgroup.gi Laurent Bartholdi ## -#H @(#)$Id$ -## -#Y Copyright (C) 2007, Laurent Bartholdi +#Y Copyright (C) 2007-2016, Laurent Bartholdi ## ############################################################################# ## diff --git a/init.g b/init.g index 156ad39..6f4df79 100644 --- a/init.g +++ b/init.g @@ -2,9 +2,7 @@ ## #W init.g Laurent Bartholdi ## -#H @(#)$Id$ -## -#Y Copyright (C) 2006, Laurent Bartholdi +#Y Copyright (C) 2006-2016, Laurent Bartholdi ## ############################################################################# ## diff --git a/read.g b/read.g index 6e3cc01..e78b0ac 100644 --- a/read.g +++ b/read.g @@ -2,9 +2,7 @@ ## #W read.g Laurent Bartholdi ## -#H @(#)$Id$ -## -#Y Copyright (C) 2006, Laurent Bartholdi +#Y Copyright (C) 2006-2016, Laurent Bartholdi ## ############################################################################# ## @@ -81,8 +79,8 @@ else fi; InstallMethod(Decomposition, [IsFRElement], DecompositionOfFRElement); -while not IsEmpty(POSTHOOK@fr) do Remove(POSTHOOK@fr)(); od; -Unbind(POSTHOOK@fr); +while not IsEmpty(POSTHOOK@FR) do Remove(POSTHOOK@FR)(); od; +Unbind(POSTHOOK@FR); if IsBound(IO_Pickle) then ReadPackage("fr","gap/pickle.g");