diff --git a/module.xml b/module.xml index b145957..5a05df0 100644 --- a/module.xml +++ b/module.xml @@ -18,7 +18,7 @@ - + diff --git a/preload/cls/_ZAPM/compat/Compat.cls b/preload/cls/_ZAPM/compat/Compat.cls deleted file mode 100644 index 497bb2d..0000000 --- a/preload/cls/_ZAPM/compat/Compat.cls +++ /dev/null @@ -1,37 +0,0 @@ -Class %ZAPM.compat.Compat -{ -/// Will be invoked after Reload and before Compile -ClassMethod CheckCompatibility() -{ - Write !, $c(9)_"Checking namespace compatibility..." - If $Namespace '= "%SYS" { - Throw ..GetError("This application must be installed in the ""%SYS"" namespace") - } - Write " OK!" - // Some classes have been renamed in IPM (v0.9+). - // The following code will change the class definition to the old class name for backward compatibility - Write !, $c(9)_"Checking package manager version compatibility..." - Set oldClass = "%ZPM.PackageManager.Developer.Lifecycle.Module" - Set newClass = "%IPM.Lifecycle.Module" - If ##class(%Dictionary.ClassDefinition).%ExistsId(newClass) { - Return - } ElseIf '##class(%Dictionary.ClassDefinition).%ExistsId(oldClass) { - Throw ..GetError("Neither "_oldClass_" nor "_newClass_" exists. Please check your installation of zpm/ipm") - } - Set classname = "%ZAPM.ext.Lifecycle" - Set cls = ##class(%Dictionary.ClassDefinition).%OpenId(classname) - If '$IsObject(cls) { - Throw ..GetError("Class "_ classname _" does not exist. Please check your src folder") - } - Set cls.Super = oldClass - $$$ThrowOnError(cls.%Save()) - Write " OK!" -} - -ClassMethod GetError(msg As %String) As %Exception.General [ Internal, Private ] -{ - Write !, "ERROR: ", msg, ! - Return ##class(%Exception.General).%New(msg) -} - -} \ No newline at end of file diff --git a/preload/cls/_ZAPM/ext/Lifecycle.cls b/preload/cls/_ZAPM/ext/Lifecycle.cls new file mode 100644 index 0000000..8197e2b --- /dev/null +++ b/preload/cls/_ZAPM/ext/Lifecycle.cls @@ -0,0 +1,20 @@ +Class %ZAPM.ext.Lifecycle Extends %ZPM.PackageManager.Developer.Lifecycle.Module +{ + +ClassMethod RunOnLoad() [ CodeMode = objectgenerator ] +{ + + Set sc = $$$OK + Try { + if $Namespace'="%SYS" { + $$$ThrowOnError($$$ERROR($$$GeneralError,"This application must be installed in the ""%SYS"" namespace ")) + } + ;$$$ThrowOnError($$$ERROR($$$GeneralError,"some error")) + } Catch e { + Set sc = e.AsStatus() + } + Return sc +} + +} + diff --git a/src/cls/%ZAPM/ext/Lifecycle.cls b/src/cls/%ZAPM/ext/Lifecycle.cls index 1d37927..8197e2b 100755 --- a/src/cls/%ZAPM/ext/Lifecycle.cls +++ b/src/cls/%ZAPM/ext/Lifecycle.cls @@ -1,4 +1,4 @@ -Class %ZAPM.ext.Lifecycle Extends %IPM.Lifecycle.Module +Class %ZAPM.ext.Lifecycle Extends %ZPM.PackageManager.Developer.Lifecycle.Module { ClassMethod RunOnLoad() [ CodeMode = objectgenerator ]