~peterpall/maxima/+git/maxima.code:KoenGu_AutomaticWxmaximaVersion

Last commit made on 2019-05-04
Get this branch:
git clone -b KoenGu_AutomaticWxmaximaVersion https://git.launchpad.net/~peterpall/maxima/+git/maxima.code

Branch merges

Branch information

Name:
KoenGu_AutomaticWxmaximaVersion
Repository:
lp:~peterpall/maxima/+git/maxima.code

Recent commits

c652f4e... by PeterPall on 2019-05-04

Windows Installer: Automatically find the newest wxMaxima release

Pro:
 - The maxima release no more needs to know the maxima version
   number
 - All updating wxMaxima in the Windows Installer requires from
   now on is building a new Windows Installer.

Contra:
 - Often all version numbers being fixed is an requirement, too.

As my private linux box only contains 4 Gigabytes of RAM and
8 Gigabytes are necessary for building an Windows Installer this
commit is entirely untested, unfortunately.

b2aade1... by PeterPall on 2019-05-04

ChangeLog/Windows installer: Remove wxMaxima's version number

For maxima's changeLog it should be sufficient to tell that the
wxMaxima contained in the maxima windows installer was updated
to a new version.

Viktor has asked once if we could make the Windows Installer
automatically use the current wxMaxima version if a new
Windows Installer is built.

In theory the following patch should archive this. But I've
no possibility to test if that works in reality, too, as
my Linux box has only 4 Gigabytes of RAM (8 are needed
in order to build a Windows Installer):

From ca217422031761c07c6aa694a2dde4dae1010f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gunter=20K=C3=B6nigsmann?= <email address hidden>
Date: Wed, 24 Apr 2019 07:08:56 +0200
Subject: [PATCH] Autodetect the version number of the current wxMaxima
 release.

---
 ChangeLog-Current.md | 4 ++--
 crosscompile-windows/wxmaxima/CMakeLists.txt | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ChangeLog-Current.md b/ChangeLog-Current.md
index 43a2cb8e3..d08f640bd 100644
--- a/ChangeLog-Current.md
+++ b/ChangeLog-Current.md
@@ -177,8 +177,8 @@ Unnumbered bugs:
 Additional improvements:
 ------------------------
  * Updated the external utilities for the Windows installer
- * Updated the wxMaxima version the Windows installer comes with
+ * The Windows installer now automagically comes with the newest
+ wxMaxima version.
  * Nightly Test: A summary of the share tests
  * Crosscompiling: Add 'maxima_longnames.c' to automake
  * Documentation Updates
diff --git a/crosscompile-windows/wxmaxima/CMakeLists.txt b/crosscompile-windows/wxmaxima/CMakeLists.txt
index 7e99e1811..2f48935ad 100644
--- a/crosscompile-windows/wxmaxima/CMakeLists.txt
+++ b/crosscompile-windows/wxmaxima/CMakeLists.txt
@@ -9,11 +9,6 @@
 # If no further patches are needed, you should get a
 # updated setup-file automatically.

-set(WXMAXIMAVERSION "19.04.3")
-
-set(WXMAXIMA_MD5 "6e9dc2127d89cc0f59d506b547e4a35f")
-
-set(WXMAXIMA_URL "https://github.com/wxmaxima-developers/wxmaxima/archive/Version-${WXMAXIMAVERSION}.tar.gz")

 set(WXMAXIMA_GIT "https://github.com/wxmaxima-developers/wxmaxima.git")

@@ -39,11 +34,11 @@ if(USE_WXMAXIMA_GIT)
     )
     install(DIRECTORY ${CMAKE_BINARY_DIR}/wxmaxima/wxmaxima-git-prefix/src/wxmaxima-git-build/${WINDOWS_DRIVELETTER}\:/maxima-${MAXIMAVERSION}/ DESTINATION . COMPONENT wxMaxima)
 else()
+ execute_process(COMMAND curl -s https://github.com/wxMaxima-developers/wxmaxima/releases/latest|grep "browser_download_url.*deb"|cut -d : -f 2,3|tr -d OUTPUT_VARIABLE WXMAXIMA_URL)
     externalproject_add(wxmaxima
         URL "${WXMAXIMA_URL}"
         DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
- DOWNLOAD_NAME wxmaxima-${WXMAXIMAVERSION}.tar.gz
- URL_MD5 ${WXMAXIMA_MD5}
+ DOWNLOAD_NAME wxmaxima.tar.gz
         DEPENDS wxwidgets
         # search wx-config here - do not use the host wx-config
         # had to set CMAKE_LIBRARY_PATH=/usr/${HOST}/lib - libraries for mingw are installed there, but CMake (>3.8)
--
2.20.1

f2c718a... by PeterPall on 2019-05-04

Updated the ChangeLog.

The only user-visible change to maxima's source code since the last
ChangeLog update was the addition of share/logic/Ksimplifier.lisp
via Merge Request #10

a71b365... by PeterPall on 2019-05-03

Merge branch 'master' of ssh://git.code.sf.net/p/maxima/code

71757c7... by PeterPall on 2019-05-03

Windows installer: Updated the wxMaxima version number

c83164f... by Kris Katterjohn on 2019-05-03

Remove some unused functions

This removes the unused functions NPRINC*, NEW-COMMENT-LINE and
PRINT-MODULE that were previously used by the translator. The
last uses of NEW-COMMENT-LINE and PRINT-MODULE were removed in
commit 11be1c1f in 2011. NPRINC* was only used in PRINT-MODULE.

2ac864f... by Kris Katterjohn on 2019-05-03

Remove a comment about old code

The comment refers to the Maclisp pretty printer SPRINTER.

No functional changes.

edcb33f... by Kris Katterjohn on 2019-05-03

Merge branch 'master' of ssh://git.code.sf.net/p/maxima/code

d147ad3... by Wolfgang Dautermann <email address hidden> on 2019-05-03

Nightly test: update sbcl

f953985... by Kris Katterjohn on 2019-05-03

Remove the obsolete STATE-PDL special variable

As the names implies, STATE-PDL was a stack representing state. In
Macsyma there were different symbols that would be pushed onto this
stack to represent what was going on at the time. Some examples
include BATCH, PLAYBACK, EDIT, MACSYMA-TOPLEVEL, LISP-TOPLEVEL,
MACSYMA-BREAK and LISP-BREAK. Then other code would check what was
on this stack and conditionally perform some tasks based on what it
found.

This stack does not serve any useful purpose now. Besides the
initial value of LISP-TOPLEVEL, only PLAYBACK could be pushed onto
the stack (but nothing checks for it) and only EDIT would be checked
for (but nothing pushes it). Other code used to check for PLAYBACK
and the old MEDIT module used to push EDIT.

No problems with the test suite or share test suite.

Here are some examples on an old Macsyma:

(C1) ?print (?state\-pdl)$
(COMPUTING MACSYMA-TOPLEVEL LISP-TOPLEVEL)

(C2) break ()$
MACSYMA-BREAK (Type EXIT; to exit.)
_?print (?state\-pdl)$
(MACSYMA-BREAK ^A-BREAK COMPUTING MACSYMA-TOPLEVEL LISP-TOPLEVEL)
_exit;
Exited from the break
Computation continuing.

(C3) to_lisp ()$
QUIT (Into LISP. Type control-G to get to MACSYMA.)

* state-pdl
(LISP-TOPLEVEL)