Changeset 4423

Timestamp:

08/14/08 12:49:40 (5 months ago)

Author:

pmoura

Message:

Added ECLiPSe 6.0 config files. Modified the POSIX script "eclipselgt" to test for both ECLiPSe 5.10 and 6.0 versions. Added Windows shortcut to start Logtalk with ECLiPSe 6.0.

Location:

trunk

Files:

• configs/eclipse.config (deleted)
• configs/eclipse5.config (added)
• configs/eclipse5iso.config (added)
• configs/eclipse6.config (added)
• configs/eclipse6iso.config (added)
• configs/eclipseiso.config (deleted)
• configs/NOTES.txt (modified) (2 diffs)
• integration/eclipselgt.sh (modified) (1 diff)
• integration/logtalk_eclipse.pl (deleted)
• integration/NOTES.txt (modified) (1 diff)
• RELEASE_NOTES.txt (modified) (1 diff)
• scripts/debian/postinst (modified) (1 diff)
• scripts/install.sh (modified) (1 diff)
• scripts/linux/logtalk.spec (modified) (1 diff)
• scripts/macosx/Portfile (modified) (1 diff)
• scripts/windows/logtalk.iss (modified) (3 diffs)

trunk/configs/NOTES.txt

@@ -164 +164 @@
 ECLiPSe 5.10#26 or later versions
 
-    eclipse.config
-    eclipseiso.config
+    eclipse5.config
+    eclipse5iso.config
 
     There are two configs files for this compiler. The first one, named 
-    "eclipse.config", should be used when, for some reason, you don't want 
-    to load the "iso" library. The second file, "eclipseiso.config" contains 
+    "eclipse5.config", should be used when, for some reason, you don't want 
+    to load the "iso" library. The second file, "eclipse5iso.config" contains 
     a call to load the "iso" library. Both config files may be used with
     ECLiPSe 5.10#26 or later versions.
 
-    You should use the "eclipseiso.config" whenever possible. The alternative 
+    You should use the "eclipse5iso.config" whenever possible. The alternative 
     config file may not contain all the needed definitions for ISO Prolog 
     predicates that are needed for compiling Logtalk itself, the Logtalk 
@@ -204 +204 @@
     built-in predicate compile/1, new clauses for dynamic predicates are 
     appended to the old ones instead of replacing them!
+
+
+ECLiPSe 6.0 or later versions
+
+    eclipse6.config
+    eclipse6iso.config
+
+    (see comments above about ECLiPSe 5.10 version)
 
 

trunk/integration/eclipselgt.sh

@@ -74 +74 @@
 echo
 
-exec eclipse -b "$LOGTALKHOME/integration/logtalk_eclipse.pl" "$@"
+if eclipse -e "halt." 2>&1 | grep "Version 5.10" 2>&1 >/dev/null; then
+    exec eclipse -b "$LOGTALKHOME/integration/logtalk_eclipse5.pl" "$@"
+else
+    exec eclipse -b "$LOGTALKHOME/integration/logtalk_eclipse6.pl" "$@"
+fi

trunk/integration/NOTES.txt

@@ -20 +20 @@
 * CIAO (version 1.10#5 or later):          ciaolgt    (first run must use sudo)
 * CxProlog (version 0.97.1 or later):      cxlgt
-* ECLiPSe (version 5.10#26 or later):      eclipselgt
+* ECLiPSe (versions 5.10, 6.0):            eclipselgt
 * GNU Prolog (version 1.3.0 or later):     gplgt
 * K-Prolog (version 5.1.2a or later):      plclgt

trunk/RELEASE_NOTES.txt

@@ -22 +22 @@
     Added support for meta-calls whose closure arguments are explicitly 
     qualified (using either Object::Closure or Module:Closure).
+
+    Added ECLiPSe 6.0 config files. Modified the POSIX script "eclipselgt" 
+    to test for both ECLiPSe 5.10 and 6.0 versions. Added Windows shortcut 
+    to start Logtalk with ECLiPSe 6.0.
 
     Updated the GNU Prolog config file to allow Logtalk to recognize as 

trunk/scripts/debian/postinst

@@ -43 +43 @@
 echo "* CIAO (version 1.10#5 or later):          ciaolgt    (first run must use sudo)"
 echo "* CxProlog (version 0.97.1 or later):      cxlgt"
-echo "* ECLiPSe (version 5.10#26 or later):      eclipselgt"
+echo "* ECLiPSe (versions 5.10, 6.0):            eclipselgt"
 echo "* GNU Prolog (version 1.3.0 or later):     gplgt"
 echo "* K-Prolog (version 5.1.x):                plclgt"

trunk/scripts/install.sh

@@ -87 +87 @@
 echo "* CIAO (version 1.10#5 or later):          ciaolgt    (first run must use sudo)"
 echo "* CxProlog (version 0.97.1 or later):      cxlgt"
-echo "* ECLiPSe (version 5.10#26 or later):      eclipselgt"
+echo "* ECLiPSe (versions 5.10, 6.0):            eclipselgt"
 echo "* GNU Prolog (version 1.3.0 or later):     gplgt"
 echo "* K-Prolog (version 5.1.2a or later):      plclgt"

trunk/scripts/linux/logtalk.spec

@@ -137 +137 @@
 echo "* CIAO (version 1.10#5 or later):          ciaolgt    (first run must use sudo)"
 echo "* CxProlog (version 0.97.1 or later):      cxlgt"
-echo "* ECLiPSe (version 5.10#26 or later):      eclipselgt"
+echo "* ECLiPSe (versions 5.10, 6.0):            eclipselgt"
 echo "* GNU Prolog (version 1.3.0 or later):     gplgt"
 echo "* K-Prolog (version 5.1.x):                plclgt"

trunk/scripts/macosx/Portfile

@@ -54 +54 @@
     ui_msg "* CIAO (version 1.10#5 or later):          ciaolgt    (first run must use sudo)"
     ui_msg "* CxProlog (version 0.97.1 or later):      cxlgt"
-    ui_msg "* ECLiPSe (version 5.10#26 or later):      eclipselgt"
+    ui_msg "* ECLiPSe (versions 5.10, 6.0):            eclipselgt"
     ui_msg "* GNU Prolog (version 1.3.0 or later):     gplgt"
     ui_msg "* K-Prolog (version 5.1.x):                plclgt"

trunk/scripts/windows/logtalk.iss

@@ -55 +55 @@
 Name: "prolog\ciao"; Description: "Ciao Prolog integration (version 1.10#5 or later)"; Types: full prolog custom; Flags: disablenouninstallwarning
 Name: "prolog\cxprolog"; Description: "CxProlog integration (version 0.97.1 or later)"; Types: full prolog custom; Flags: disablenouninstallwarning
-Name: "prolog\eclipse"; Description: "ECLiPSe integration (version 5.10#26 or later)"; Types: full prolog custom; Flags: disablenouninstallwarning
+Name: "prolog\eclipse"; Description: "ECLiPSe integration (versions 5.10, 6.0)"; Types: full prolog custom; Flags: disablenouninstallwarning
 Name: "prolog\gprolog"; Description: "GNU Prolog integration (version 1.3.0 or later)"; Types: full prolog custom; Flags: disablenouninstallwarning
 Name: "prolog\plc"; Description: "K-Prolog integration (version 5.1.x)"; Types: full prolog custom; Flags: disablenouninstallwarning
@@ -115 +115 @@
 Name: "{group}\Logtalk - CxProlog"; Filename: "{code:GetCxExePath}"; Parameters: "--goal ""silent_consult('%LOGTALKHOME%/integration/logtalk_cx.pl')"""; Comment: "Runs Logtalk with CxProlog"; WorkingDir: "{code:GetLgtUserDir}"; Components: prolog\cxprolog; Flags: createonlyiffileexists
 
-Name: "{group}\Logtalk - ECLiPSe"; Filename: "{code:GetEclipseExePath}"; Parameters: "-b ""%LOGTALKHOME%\integration\logtalk_eclipse.pl"""; Comment: "Runs Logtalk with ECLiPSe"; WorkingDir: "{code:GetLgtUserDir}"; Components: prolog\eclipse; Flags: createonlyiffileexists
+Name: "{group}\Logtalk - ECLiPSe 5"; Filename: "{code:GetEclipse5ExePath}"; Parameters: "-b ""%LOGTALKHOME%\integration\logtalk_eclipse5.pl"""; Comment: "Runs Logtalk with ECLiPSe 5"; WorkingDir: "{code:GetLgtUserDir}"; Components: prolog\eclipse; Flags: createonlyiffileexists
+
+Name: "{group}\Logtalk - ECLiPSe 6"; Filename: "{code:GetEclipse6ExePath}"; Parameters: "-b ""%LOGTALKHOME%\integration\logtalk_eclipse6.pl"""; Comment: "Runs Logtalk with ECLiPSe 6"; WorkingDir: "{code:GetLgtUserDir}"; Components: prolog\eclipse; Flags: createonlyiffileexists
 
 Name: "{group}\Logtalk - GNU Prolog"; Filename: "{code:GetGPExePath}"; Parameters: "--init-goal ""['$LOGTALKUSER/configs/gnu.config', '$LOGTALKHOME/integration/logtalk_gp.pl', '$LOGTALKUSER/libpaths/libpaths.pl']"""; Comment: "Runs Logtalk with GNU Prolog"; WorkingDir: "{code:GetLgtUserDir}"; Components: prolog\gprolog; Flags: createonlyiffileexists
@@ -271 +273 @@
 end;
 
-function GetEclipseExePath(Param: String): String;
+function GetEclipse5ExePath(Param: String): String;
 var
   ECLIPSEDIR: String;
 begin
-  if RegQueryStringValue(HKLM, 'Software\IC-Parc\Eclipse\5.11\', 'ECLIPSEDIR', ECLIPSEDIR) then
+  if RegQueryStringValue(HKLM, 'Software\IC-Parc\Eclipse\5.10\', 'ECLIPSEDIR', ECLIPSEDIR) then
     Result := ECLIPSEDIR + '\lib\i386_nt\eclipse.exe'
-  else if RegQueryStringValue(HKLM, 'Software\IC-Parc\Eclipse\5.10\', 'ECLIPSEDIR', ECLIPSEDIR) then
+  else
+    Result := 'lgt_exe_does_not_exist'
+end;
+
+function GetEclipse6ExePath(Param: String): String;
+var
+  ECLIPSEDIR: String;
+begin
+  if RegQueryStringValue(HKLM, 'Software\IC-Parc\Eclipse\6.0\', 'ECLIPSEDIR', ECLIPSEDIR) then
     Result := ECLIPSEDIR + '\lib\i386_nt\eclipse.exe'
   else