Changeset fa037e6 in tol

Timestamp:

Feb 9, 2012, 11:24:10 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

567b369

Parents:

01e6165

Message:

Refs #1424
New methods to check packages with DLL and avoid locking problems at package deletion

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4096 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/stdlib/general/TolPackage/client.tol (modified) (3 diffs)

tol/stdlib/general/TolPackage/client.tol

@@ -1022 +1022 @@
 };
 
-////////////////////////////////////////////////////////////////////////////////
-  Text CppTools.Path(NameBlock package)
-////////////////////////////////////////////////////////////////////////////////
-{
-  Text packageName = package::_.autodoc.name;
-  Text dllPath.rel = GetAbsolutePath("CppTools/"+ GetHardSoftPlattform(0));
-  Text dllPath.deb = dllPath.rel+"_dbg";
-  Text dllFile.rel = dllPath.rel+"/"+packageName+"."+GetSharedLibExt(0);
-  Text dllFile.deb = dllPath.deb+"/"+packageName+"."+GetSharedLibExt(0);
+
+////////////////////////////////////////////////////////////////////////////////
+  Text CppTools.CalcPath(Text packageFullName)
+////////////////////////////////////////////////////////////////////////////////
+{
+  Text packageName = Tokenizer(packageFullName,".")[1];
+  Text dllRoot.rel = GetAbsolutePath(
+     _.localRoot+packageFullName+
+     "/CppTools/"+ GetHardSoftPlattform(0));
+  Text dllRoot.deb = dllRoot.rel+"_dbg";
+  Text dllFile.rel = dllRoot.rel+"/"+packageName+"."+GetSharedLibExt(0);
+  Text dllFile.deb = dllRoot.deb+"/"+packageName+"."+GetSharedLibExt(0);
   If(!TextEndAt(Version,"{DEBUG}"),dllFile.rel,
   {
@@ -1043 +1046 @@
 
 ////////////////////////////////////////////////////////////////////////////////
+  Text CppTools.Path(NameBlock pkg)
+////////////////////////////////////////////////////////////////////////////////
+{
+  Text packageFullName = 
+    pkg::_.autodoc.name+"."<<
+    pkg::_.autodoc.version.high+"."<<
+    pkg::_.autodoc.version.low;
+  CppTools.CalcPath(packageFullName)
+};
+
+////////////////////////////////////////////////////////////////////////////////
   Real CppTools.Check(NameBlock package, Text dllFile, Text chechMethod)
 ////////////////////////////////////////////////////////////////////////////////
@@ -1051 +1065 @@
           " -> "<<If(ok,"OK","FAIL"),If(ok,"S","E"));
   ok
+};
+
+////////////////////////////////////////////////////////////////////////////////
+  Real CppTools.HasDll(Text packageFullName)
+////////////////////////////////////////////////////////////////////////////////
+{
+  Text dllFile = CppTools.CalcPath(packageFullName);
+  OSFilExist(dllFile)
+};
+
+////////////////////////////////////////////////////////////////////////////////
+  Real CppTools.HasLockedDll(Text packageFullName)
+////////////////////////////////////////////////////////////////////////////////
+{
+  Text dllFile = CppTools.CalcPath(packageFullName);
+  If(!OSFilExist(dllFile), False,
+  {
+    Real open = FOpen(dllFile,"r+b",True,False);
+    If(open, FClose(open));
+    Not(open)
+  })
 }
 
 
+
 ]];