Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"objectscript.conn": {
"active": true,
"docker-compose": {
"service": "iris"
},
"username": "_system",
"password": "SYS",
"host": "localhost",
"server": "docker-iris",
"ns": "USER"
},
// Non-default export settings needed so Testing Manager extension can find sources when doing coverage runs
Expand All @@ -28,5 +25,17 @@
"editor.detectIndentation": false,
"editor.insertSpaces": true,
"editor.formatOnSave": true,
"files.trimTrailingWhitespace": true
"files.trimTrailingWhitespace": true,
"intersystems.servers": {
"docker-iris": {
"webServer": {
"scheme": "http",
"host": "localhost",
"port": 52774,
"pathPrefix": ""
},
"username": "_SYSTEM",
"password": "SYS"
}
}
}
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Performance: Studio project creation on package load in dev mode is now 80% faster.
- #994: Prevent crash in `zn` command when target namespace lacks IPM mappings
- #1215: installer is synchronous rather than jobbed for simplified logging/debugging

## [0.10.9] - 2026-08-05

Expand Down
43 changes: 10 additions & 33 deletions preload/cls/IPM/Installer.cls
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ XData PM [ XMLNamespace = INSTALLER ]
</Configuration>
<Invoke Class="IPM.Installer" Method="CleanupOldMappings"/>
<Import File="${SRCDIR}" Recurse="1"/>
<Invoke Class="IPM.Installer" Method="ForceCompileEvenInSYS" />
<Invoke Class="%IPM.Main" Method="UpdateLanguageExtensions" CheckStatus="true" />
<Invoke Class="IPM.Installer" Method="ZPMInit" CheckStatus="true">
<Arg Value="${REGISTRY}"/>
Expand All @@ -42,6 +43,13 @@ XData PM [ XMLNamespace = INSTALLER ]
</Manifest>
}

ClassMethod ForceCompileEvenInSYS()
{
$$$RemoveClsTempNodes
do $system.OBJ.CompilePackage("%IPM","ckf")
$$$AddClsTempNodes
}

XData MapOnly [ XMLNamespace = INSTALLER ]
{
<Manifest>
Expand Down Expand Up @@ -95,16 +103,6 @@ ClassMethod Map(
quit ##class(%Installer.Manifest).%Generate(%compiledclass, %code, "MapOnly")
}

ClassMethod AsyncSetup(Args...)
{
try {
set tSC = ..setup(Args...)
} catch ex {
set tSC = ex.AsStatus()
}
do $system.Event.Signal($zparent, tSC)
}

ClassMethod ZPMInit(
pRegistry As %String = "",
pAnalyticsTrackingID As %String = "")
Expand Down Expand Up @@ -214,31 +212,10 @@ ClassMethod EndCompile(qstruct) As %Status
write !,"Installing ZPM"

set ts = $zhorolog
set logFile=##class(%File).TempFilename()
job ..AsyncSetup(tModDir, 3):(:::logFile):0
if '$test {
quit $$$ERROR($$$GeneralError, "Job did not start")
}

#; Wait setup
set child=$zchild
set tSC = $$$OK
do {
hang 1
set $listbuild(res, tSC) = $system.Event.WaitMsg("", 10)
quit:res=1
} while $data(^$job(child))

set fs=##class(%Stream.FileCharacter).%New()
set fs.Filename=logFile
while 'fs.AtEnd {
write !,fs.ReadLine()
}
if ##class(%File).Delete(logFile)

set sc = ..setup(tModDir, 3)
write !,"Time spent ",$zhorolog - ts

quit tSC
quit sc
}

/// Check currently installed version, if any
Expand Down
Loading