From: Alan Knowles Date: Mon, 2 May 2022 03:03:06 +0000 (+0800) Subject: Release 1.4 - slightly different api for Symbolset X-Git-Tag: release-1.5~3 X-Git-Url: http://git.roojs.org/?p=roojspacker;a=commitdiff_plain;h=961d47a4604ce240a43c336928da0072c24d9401 Release 1.4 - slightly different api for Symbolset --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bc0828..421336c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,14 +14,14 @@ set(PROJECT_BUGS "https://www.roojs.com/mtrack/") # # This should be incremented with every release. See semver.org. set (ROOJSPACKER_VERSION_MAJOR 1) -set (ROOJSPACKER_VERSION_MINOR 2) +set (ROOJSPACKER_VERSION_MINOR 4) set (ROOJSPACKER_VERSION_REVISION 0) # API version. # # This will go in the pkg-config and shared library names. Should # only be changed if the API breaks backwards compatibility. -set (ROOJSPACKER_VERSION_API "1.2") +set (ROOJSPACKER_VERSION_API "1.4") set (ROOJSPACKER_SOVERSION_CURRENT ${ROOJSPACKER_VERSION_MAJOR}) set (ROOJSPACKER_SOVERSION_REVISION ${ROOJSPACKER_VERSION_MINOR}) set (ROOJSPACKER_SOVERSION_AGE ${ROOJSPACKER_VERSION_REVISION}) @@ -85,7 +85,7 @@ list(APPEND VALA_COMPILER_FLAGs_DEBUG "--debug") include(AddCompilerFlags) -global_add_compiler_flags(-Wno-incompatible-pointer-types) +# global_add_compiler_flags(-Wno-incompatible-pointer-types) set(LIBS diff --git a/debian/changelog b/debian/changelog index be8b3f2..54762e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -roojspacker (1.3) UNRELEASED; urgency=medium +roojspacker (1.4) UNRELEASED; urgency=medium * Upgrading detection of multiple features , including adding child depenancies and value lists etc. - -- Alan Tue, 26 Apr 2022 10:57:58 +0800 + -- Alan Knowles Mon, 02 May 2022 10:37:20 +0800 roojspacker (1.2) unstable; urgency=medium diff --git a/debian/files b/debian/files index 2eb9cd5..5a58ab3 100644 --- a/debian/files +++ b/debian/files @@ -1,3 +1,3 @@ -roojspacker-dbgsym_1.3_amd64.ddeb debug optional automatic=yes -roojspacker_1.3_amd64.buildinfo unknown optional -roojspacker_1.3_amd64.deb unknown optional +roojspacker-dbgsym_1.4_amd64.ddeb debug optional automatic=yes +roojspacker_1.4_amd64.buildinfo unknown optional +roojspacker_1.4_amd64.deb unknown optional diff --git a/roojspacker/.gitignore b/roojspacker/.gitignore index d1a2722..9f6f6a5 100644 --- a/roojspacker/.gitignore +++ b/roojspacker/.gitignore @@ -1,28 +1,28 @@ # Automatically generated by CMake, do not modify. /.gitignore -/libroojspacker-1.2.so* -/libroojspacker-1.2.a -/libroojspacker-1.2.so.1.2 -/libroojspacker-1.2.so.1.2.0 -/roojspacker-1.2.pc +/libroojspacker-1.4.so* +/libroojspacker-1.4.a +/libroojspacker-1.4.so.1.4 +/libroojspacker-1.4.so.1.4.0 +/roojspacker-1.4.pc /config.vala -/roojspacker-1.2-vala/source/roojspacker/Collapse.c -/roojspacker-1.2-vala/source/roojspacker/CompressWhite.c -/roojspacker-1.2-vala/source/roojspacker/Identifier.c -/roojspacker-1.2-vala/source/roojspacker/Lang.c -/roojspacker-1.2-vala/source/roojspacker/Packer.c -/roojspacker-1.2-vala/source/roojspacker/ScopeParser.c -/roojspacker-1.2-vala/source/roojspacker/Scope.c -/roojspacker-1.2-vala/source/roojspacker/TextStream.c -/roojspacker-1.2-vala/source/roojspacker/TokenReader.c -/roojspacker-1.2-vala/source/roojspacker/TokenStream.c -/roojspacker-1.2-vala/source/roojspacker/Token.c -/roojspacker-1.2-vala/source/roojspacker/PackerRun.c -/roojspacker-1.2-vala/source/roojspacker/Walker.c -/roojspacker-1.2-vala/source/roojspacker/SymbolSet.c -/roojspacker-1.2-vala/source/roojspacker/DocBuilder.c -/roojspacker-1.2-vala/source/roojspacker/DocComment.c -/roojspacker-1.2-vala/source/roojspacker/DocParser.c -/roojspacker-1.2-vala/source/roojspacker/DocTag.c -/roojspacker-1.2-vala/source/roojspacker/PrettyPrint.c -/roojspacker-1.2-vala/source/roojspacker/Symbol.c +/roojspacker-1.4-vala/source/roojspacker/Collapse.c +/roojspacker-1.4-vala/source/roojspacker/CompressWhite.c +/roojspacker-1.4-vala/source/roojspacker/Identifier.c +/roojspacker-1.4-vala/source/roojspacker/Lang.c +/roojspacker-1.4-vala/source/roojspacker/Packer.c +/roojspacker-1.4-vala/source/roojspacker/ScopeParser.c +/roojspacker-1.4-vala/source/roojspacker/Scope.c +/roojspacker-1.4-vala/source/roojspacker/TextStream.c +/roojspacker-1.4-vala/source/roojspacker/TokenReader.c +/roojspacker-1.4-vala/source/roojspacker/TokenStream.c +/roojspacker-1.4-vala/source/roojspacker/Token.c +/roojspacker-1.4-vala/source/roojspacker/PackerRun.c +/roojspacker-1.4-vala/source/roojspacker/Walker.c +/roojspacker-1.4-vala/source/roojspacker/SymbolSet.c +/roojspacker-1.4-vala/source/roojspacker/DocBuilder.c +/roojspacker-1.4-vala/source/roojspacker/DocComment.c +/roojspacker-1.4-vala/source/roojspacker/DocParser.c +/roojspacker-1.4-vala/source/roojspacker/DocTag.c +/roojspacker-1.4-vala/source/roojspacker/PrettyPrint.c +/roojspacker-1.4-vala/source/roojspacker/Symbol.c diff --git a/roojspacker/SymbolSet.vala b/roojspacker/SymbolSet.vala index ef279bb..44eeb36 100644 --- a/roojspacker/SymbolSet.vala +++ b/roojspacker/SymbolSet.vala @@ -9,14 +9,14 @@ namespace JSDOC { public Json.Object toJson() { var ret = new Json.Object(); - foreach(var k in this._index.keys) { - ret.set_object_member(k, this._index.get(k).toJson()); + foreach(var k in this.pr_index.keys) { + ret.set_object_member(k, this.pr_index.get(k).toJson()); } return ret; } - public Gee.HashMap _index { + public Gee.HashMap pr_index { get { if (this.__index == null) { GLib.debug("Creating new Symbolset array"); @@ -35,7 +35,7 @@ namespace JSDOC { public Gee.ArrayList keys() { var r= new Gee.ArrayList(); - foreach(var k in this._index.keys) { + foreach(var k in this.pr_index.keys) { r.add(k); } return r; @@ -44,7 +44,7 @@ namespace JSDOC { public Gee.ArrayList values() { var r= new Gee.ArrayList(); - foreach(var k in this._index.values) { + foreach(var k in this.pr_index.values) { r.add(k); } return r; @@ -53,7 +53,7 @@ namespace JSDOC { public bool hasSymbol(string alias) { - return this._index.has_key(alias); + return this.pr_index.has_key(alias); //return this.keys().indexOf(alias) > -1; } @@ -65,12 +65,12 @@ namespace JSDOC { GLib.warning("Skip Overwriting symbol documentation for: %s.",symbol.alias); return; } - this._index.set(symbol.alias, symbol); + this.pr_index.set(symbol.alias, symbol); } public Symbol? getSymbol (string alias) { - if (this.hasSymbol(alias)) return this._index.get(alias); + if (this.hasSymbol(alias)) return this.pr_index.get(alias); return null; } /*/ @@ -96,7 +96,7 @@ namespace JSDOC { public void deleteSymbol (string alias) { if (!this.hasSymbol(alias)) return; - this._index.unset(alias); + this.pr_index.unset(alias); } public string renameSymbol (string oldName, string newName) { @@ -104,24 +104,24 @@ namespace JSDOC { if (!this.hasSymbol(oldName)) { GLib.error("Cant rename " + oldName + " to " + newName + " As it doesnt exist"); } - this._index.set(newName, this._index.get(oldName)); + this.pr_index.set(newName, this.pr_index.get(oldName)); this.deleteSymbol(oldName); - this._index.get(newName).alias = newName; + this.pr_index.get(newName).alias = newName; return newName; } public void relate() { GLib.debug("RELATE called"); - foreach(var s in this._index.keys) { - GLib.debug("%s", this._index.get(s).asString()); + foreach(var s in this.pr_index.keys) { + GLib.debug("%s", this.pr_index.get(s).asString()); } this.resolveBorrows(); this.resolveMemberOf(); this.resolveAugments(); GLib.debug("AFTER RELATE called"); - foreach(var s in this._index.keys) { - GLib.debug("%s", this._index.get(s).asString()); + foreach(var s in this.pr_index.keys) { + GLib.debug("%s", this.pr_index.get(s).asString()); } } @@ -176,7 +176,7 @@ namespace JSDOC { void resolveMemberOf () { - if (this._index.keys.size < 1) { + if (this.pr_index.keys.size < 1) { return; } foreach (var p in this.keys()) { @@ -292,7 +292,7 @@ namespace JSDOC { { // does this sort out multiple extends??? - foreach (var p in this._index.keys) { + foreach (var p in this.pr_index.keys) { var symbol = this.getSymbol(p); this.buildAugmentsList(symbol); /// build heirachy of inheritance... if (symbol.alias == "_global_" || symbol.is("FILE")) continue; diff --git a/roojspacker/roojspacker.pc.in b/roojspacker/roojspacker.pc.in index 3c30051..b21d32d 100644 --- a/roojspacker/roojspacker.pc.in +++ b/roojspacker/roojspacker.pc.in @@ -10,6 +10,6 @@ Name: roojspacker Description: Javascript packer Version: @VERSION@ Requires: glib-2.0 gobject-2.0 gee-0.8 gio-2.0 gthread-2.0 -Libs: -lroojspacker-1.2 +Libs: -lroojspacker-1.4 Cflags: -I${includedir}/roojspacker