Windows installer release 1.6 built, with some changes, closes #757.

TerraME · Oct 27, 2015 · 65e7e35 · 65e7e35
1 parent cf2a3c6
commit 65e7e35
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/base/lua/CellularSpace.lua b/base/lua/CellularSpace.lua
@@ -788,7 +788,8 @@ CellularSpace_ = {
 	-- "*.gpm" & Load a Neighborhood from a GPM (generalized proximity matrix) file. \
 	-- Any other & Load a Neighborhood from table stored in the same database of the 
 	-- CellularSpace. \
-	-- @usage config = getConfig()
+	-- @usage -- DONTRUN
+	-- config = getConfig() 
 	-- mhost = config.host
 	-- muser = config.user
 	-- mpassword = config.password

diff --git a/base/tests/core/basics/Timer.lua b/base/tests/core/basics/Timer.lua
@@ -143,7 +143,7 @@ cObj_   userdata
 events  table of size 1
 round   number [1e-05]
 time    number [-inf]
-]])
+]], 8)
 	end,
 	add = function(unitTest)
 		local cont = 0
@@ -292,4 +292,3 @@ time    number [-inf]
 		unitTest:assertEquals(18, cont)
 	end
 }
-
diff --git a/installer/win/tme.iss b/installer/win/tme.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "TerraME"
-#define MyAppVersion "1.4.0"
+#define MyAppVersion "1.6.0"
 #define MyAppPublisher "INPE"
 #define MyAppURL "http://www.terrame.org/"
 #define MyAppExeName "terrame.exe"
@@ -25,7 +25,7 @@ DefaultGroupName={#MyAppName}
 DisableProgramGroupPage=yes
 LicenseFile=..\..\licenses\terrame-license-lgpl-3.0.txt
 OutputDir=setup
-OutputBaseFilename=terrame-1.4.0-win32
+OutputBaseFilename=terrame-1.6.0-win32
 Compression=lzma
 SolidCompression=yes
 ChangesEnvironment=yes
@@ -39,6 +39,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "..\..\bin\terrame.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\cp.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\find-msys.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\libEGL.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\libGLESV2.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -65,7 +66,6 @@ Source: "..\..\bin\Qt5OpenGL.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\Qt5PrintSupport.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\Qt5Svg.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\bin\qtlua.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\qtluae.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\qwt.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\rm.exe"; DestDir: "{app}"; Flags: ignoreversion

diff --git a/src/lua/doc.lua b/src/lua/doc.lua
@@ -372,7 +372,9 @@ function _Gtme.executeDoc(package)
 	local result = luadocMain(package_path, lua_files, example_files, package, mdata, mfont, doc_report)
 
 	if isDir(package_path..s.."font") then
-		os.execute("cp "..package_path..s.."font"..s.."* "..package_path..s.."doc"..s.."files")
+		local cmd = "cp "..package_path..s.."font"..s.."* "..package_path..s.."doc"..s.."files"
+		cmd = _Gtme.makePathCompatibleToAllOS(cmd)
+		os.execute(cmd)
 	end
 
 	local all_functions = _Gtme.buildCountTable(package)

diff --git a/test/repository.lua b/test/repository.lua
@@ -6,23 +6,26 @@
 local initialTime = os.time(os.date("*t"))
 local s = sessionInfo().separator
 local baseDir = sessionInfo().path
-local pkgDir = baseDir..s.."packages"
+local pkgDir = _Gtme.makePathCompatibleToAllOS(baseDir..s.."packages")
+
 
 _Gtme.printNote("Creating temporary folder")
 tmpfolder = runCommand("mktemp -d .terramerepository_XXXXX")[1]
 chDir(tmpfolder)
 
 _Gtme.printNote("Copying currently installed packages")
 
-os.execute("cp -R \""..pkgDir.."\" .")
+local cpCmd = _Gtme.makePathCompatibleToAllOS("cp -R \""..pkgDir.."\" .")
+os.execute(cpCmd)
 
 
 local pkgs = _Gtme.downloadPackagesList()
 
 local report = {
 	packages = 0,
 	errors = 0,
-	createdlogs = 0
+	createdlogs = 0,
+	locallogerrors = 0
 }
 
 _Gtme.printNote("Downloading packages from www.terrame.org/packages")
@@ -162,8 +165,10 @@ end)
 
 _Gtme.printNote("Rolling back to previously installed packages")
 
-os.execute("rm -rf \""..pkgDir.."\"")
-os.execute("cp -R \"packages\" \""..pkgDir.."\"")
+local rmCmd = _Gtme.makePathCompatibleToAllOS("rm -rf \""..pkgDir.."\"")
+os.execute(rmCmd)
+local cpCmd = _Gtme.makePathCompatibleToAllOS("cp -R \"packages\" \""..pkgDir.."\"")
+os.execute(cpCmd)
 
 local finalTime = os.time(os.date("*t"))