Skip to content

Commit

Permalink
Prepare the 20.1.1 release
Browse files Browse the repository at this point in the history
Mainly because of the fontification bug in 20.1.0.
The documentation is still a mess..
  • Loading branch information
dieter-wilhelm committed Feb 23, 2020
1 parent bb7a425 commit 99508a2
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 61 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ helper/tools*
*.tar
misc/
helper/apdl-keyword*
helper/apdl-mode-*
helper/apdl-mode-*
apdl-config.el
18 changes: 9 additions & 9 deletions TODO.org
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#+DATE: Time-stamp: <2020-02-22>
#+DATE: Time-stamp: <2020-02-23>
#+bind: org-html-preamble-format (("en" "%d"))
#+OPTIONS: html-link-use-abs-url:nil html-postamble:t html-preamble:t
#+OPTIONS: html-scripts:t html-style:t html5-fancy:nil tex:t
Expand All @@ -20,24 +20,24 @@ How bad is install docu in 20.1.0?

* TODO 20.2.0 Release
DEADLINE: <2020-04-20 Mon>
- WB template system => template branch
- WB template system => template branch: OK
- temperature dependent material
- reaction forces
- some images in post
- writing files
- brittle failure criterion
- updating intro tutorial and docu => presentation, (online)
documentation: still ANSYS-Mode 16.1.!
documentation: still a mess after renaming
** Todos
- What about WB JavaScript!?
- WB templates :-), no geom stuff
- new -wb-template.el
- shift APDL templates away
- search templates with keywords
- Snippet types
- Command snippet types
- Model items /prep7 like, "attached to model items"
- Setup items, /solu (before solve command)
- Postprocessing items, /post
- What about WB JavaScript!?
- First edit in *APDL code*: self-insert-command: Wrong number of
arguments: (0 . 0), 3
** minor bugs
Expand Down Expand Up @@ -256,7 +256,7 @@ How bad is install docu in 20.1.0?
- check whether all undocumented commands
[[elisp:(find-tag "Ansys_undocumented_commands")]]
are still working in V 162
- (tags-search "TODO")
- (tags-search "-TODO-")
- (tags-search "FIXME")
- checkdoc, -ansys-template.el, -ansys-process.el, -mode.el done except
\\<keymap> & \\[function]
Expand All @@ -277,11 +277,11 @@ How bad is install docu in 20.1.0?
# version No
(tags-query-replace "161" "162")
# for _mode_version
(tags-query-replace "1\.1" "1.2")
(tags-query-replace "20\.1\.0" "20.1.1")
(tags-query-replace "\"1.1\"" "\"1.2\"")
# copyright
(tags-query-replace "- 2015" "- 2016")
(tags-query-replace "fontification.mac" "example.mac")
(tags-query-replace "- 2020" "- 2021")
# (tags-query-replace "fontification.mac" "example.mac")

checkdoc then dry run: Emacs
24.5 -Q testing: example.mac /*commands and default command
Expand Down
27 changes: 15 additions & 12 deletions apdl-initialise.el
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
;;; apdl-initialise.el -- initialisation code for apdl-mode -*- lexical-binding: t -*-
;; Time-stamp: <2020-02-20>
;; Time-stamp: <2020-02-23>
;; Copyright (C) 2020 H. Dieter Wilhelm

;; Author: H. Dieter Wilhelm <dieter@duenenhof-wilhelm.de>
;; Version: R20.1.0
;; Version: 20.1.1
;; Keywords: languages, convenience, extensions

;; This program is free software; you can redistribute it and/or modify
Expand All @@ -28,7 +28,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; constants

(defconst apdl-mode-version "20.1.0"
(defconst apdl-mode-version "20.1.1"
"APDL-Mode version.")

(defconst apdl-ansys-version "v161"
Expand Down Expand Up @@ -163,7 +163,7 @@ Set it to port@host. The default port is 2325."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; defining variables

;; (defvar apdl-unix-system-flag nil
;; (defvar apdl-is-unix-system-flag nil
;; "Non-nil means APDL-mode runs under a Unix system.")

(defvar apdl-current-ansys-version nil
Expand All @@ -172,6 +172,9 @@ This variable is used by the `apdl-skeleton-header' template and
for setting up variables defaults with ANSYS path specifications,
like in the variable `apdl-ansys-program'.")

;; from -mode.el
(defvar apdl-is-unix-system-flag)

;; from -process.el
(defvar apdl-classics-flag)

Expand All @@ -194,7 +197,7 @@ return nil."
nil))
ini
)
(if apdl-unix-system-flag
(if apdl-is-unix-system-flag
(setq ini (concat idir "shared_files/licensing/ansyslmd.ini"))
(setq ini (concat idir "Shared Files/Licensing/ansyslmd.ini")))
(if (file-readable-p ini)
Expand Down Expand Up @@ -243,7 +246,7 @@ When argument FORCE is non-nil overwrite already set
customisation variables"
(message "Initialising system dependent stuff ...")
;; 0) -unix-system-flag
(setq apdl-unix-system-flag (apdl-is-unix-system-p))
(setq apdl-is-unix-system-flag (apdl-is-unix-system-p))

;; 1) -install-directory (with versioning information)
(when (null apdl-ansys-install-directory)
Expand Down Expand Up @@ -304,7 +307,7 @@ customisation variables"

;; 1a) -classics-flag
(let* ()
(if (and apdl-unix-system-flag (apdl-classics-p))
(if (and apdl-is-unix-system-flag (apdl-classics-p))
(setq apdl-classics-flag t)))

;; 2) -current-apdl-version:
Expand All @@ -325,7 +328,7 @@ customisation variables"
(let* ((version1 apdl-current-ansys-version)
(idir (unless (null apdl-ansys-install-directory)
(file-name-directory apdl-ansys-install-directory)))
(exe (if apdl-unix-system-flag
(exe (if apdl-is-unix-system-flag
(concat idir "ansys/bin/ansys" version1)
(concat idir "ansys/bin/winx64/ansys"version1".exe"))))
(if (file-executable-p exe)
Expand All @@ -338,7 +341,7 @@ customisation variables"
(when (and apdl-ansys-install-directory (or (null apdl-ansys-wb) force))
(let* ((idir apdl-ansys-install-directory)
(exe
(if apdl-unix-system-flag
(if apdl-is-unix-system-flag
(concat idir "Framework/bin/Linux64/runwb2") ;150, 161
(concat idir "Framework/bin/Win64/RunWB2.exe" ))))
(when (file-executable-p exe)
Expand All @@ -353,7 +356,7 @@ customisation variables"
(idir (unless (null apdl-ansys-install-directory)
(file-name-directory apdl-ansys-install-directory)))
(exe
(if apdl-unix-system-flag
(if apdl-is-unix-system-flag
(concat idir "ansys/bin/launcher" version1)
(concat idir "ansys/bin/winx64/launcher" version1 ".exe"))))
(when (file-executable-p exe)
Expand All @@ -377,7 +380,7 @@ customisation variables"
(let* ((idir apdl-ansys-install-directory)
(version1 apdl-current-ansys-version)
(exe
(if apdl-unix-system-flag
(if apdl-is-unix-system-flag
(concat idir "ansys/bin/anshelp" version1)
(concat idir "commonfiles/help/HelpViewer/ANSYSHelpViewer.exe"))))
(if (file-executable-p exe)
Expand All @@ -392,7 +395,7 @@ customisation variables"
(directory-file-name
apdl-ansys-install-directory)))
(exe
(if apdl-unix-system-flag
(if apdl-is-unix-system-flag
(concat idir "shared_files/licensing/linx64/lmutil")
(concat idir "Shared Files/Licensing/winx64/lmutil.exe"))))
(if (file-executable-p exe)
Expand Down
23 changes: 1 addition & 22 deletions apdl-mode-pkg.el
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,8 @@
;; comint
;; browse-url

;; "
;; APDL (Ansys Parametric Design Language) is the solver scripting
;; language of the FEA (Finite Element Analysis) suite ANSYS (ANalysis
;; SYStem, registered TM http://www.ansys.com).

;; APDL-Mode (formerly ANSYS-Mode) represents, in conjunction with
;; the GNU-Emacs editor, an advanced APDL environment. Including
;; features features like immediate documentation access, keyword
;; completion, code templates, dedicated keybindings, solver
;; communication (GNU-Linux only), license reporting, etc.

;; ------------------------------
;; First usage:

;; Open an APDL-Mode buffer with `M-x apdl'. From there you might
;; investigate the menu entries `APDL' and `ANSYS'.

;; For the APDL-Mode help with a brief tutorial and further guidance
;; please type `C-h m'."

;; short doc string less than 36 chars!?

(define-package "apdl-mode" "20.1.0" "Major mode for the APDL programming language."
(define-package "apdl-mode" "20.1.1" "Major mode for the APDL programming language."
'((emacs "25.1"))
:keywords
'("APDL" "ANSYS" "languages" "FEA" "convenience" "tools")
Expand Down
4 changes: 2 additions & 2 deletions apdl-mode.el
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
;;; apdl-mode.el --- The major mode for the language APDL. -*- lexical-binding: t -*-
;; Time-stamp: <2020-02-21>
;; Time-stamp: <2020-02-23>

;; Copyright (C) 2006 - 2020 H. Dieter Wilhelm GPL V3

;; Author: H. Dieter Wilhelm <dieter@duenenhof-wilhelm.de>
;; Version: 20.1.0
;; Version: 20.1.1
;; Package-Requires: ((emacs "25"))
;; Keywords: languages, convenience, tools, ANSYS, APDL
;; URL: https://github.com/dieter-wilhelm/apdl-mode
Expand Down
4 changes: 2 additions & 2 deletions apdl-process.el
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
;;; apdl-process.el --- Managing runs and processes for APDL-Mode -*- lexical-binding: t; -*-
;; Time-stamp: <2020-02-18>
;; Time-stamp: <2020-02-23>

;; Copyright (C) 2006 - 2020 H. Dieter Wilhelm GPL V3

;; Author: H. Dieter Wilhelm <dieter@duenenhof-wilhelm.de>
;; Version: 20.1.0
;; Version: 20.1.1
;; Package-Requires: ((emacs "25"))
;; Keywords: languages, convenience
;; URL: https://github.com/dieter-wilhelm/apdl-mode
Expand Down
2 changes: 1 addition & 1 deletion apdl-template.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

;; Author: H. Dieter Wilhelm <dieter@duenenhof-wilhelm.de>
;; Maintainer: H. Dieter Wilhelm
;; Version: 20.1.0
;; Version: 20.1.1
;; Package-Requires: ((emacs "25"))
;; Keywords: languages, convenience, ANSYS, tools, APDL
;; URL: https://github.com/dieter-wilhelm/apdl-mode
Expand Down
8 changes: 4 additions & 4 deletions helper/fontification.el
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
;;; fontification.el --- building keywords and completions

;; Copyright (C) 2006 - 2015 H. Dieter Wilhelm
;; Copyright (C) 2006 - 2020 H. Dieter Wilhelm

;; Author: H. Dieter Wilhelm <dieter@duenenhof-wilhelm.de>
;; Version: 20.1.0
;; Version: 20.1.1
;; Package-Requires: ((emacs "25"))
;; Keywords: languages, convenience, tools, ANSYS, APDL
;; URL: https://github.com/dieter-wilhelm/apdl-mode
Expand Down Expand Up @@ -877,9 +877,9 @@ By default APDL keywords, get-functions, parametric-function and elements
(goto-char (point-min))
(insert ";; apdl-keyword.el --- APDL-Mode completion and"
"highlighting variables. -*- lexical-binding:t -*-\n" ";; This file was built by"
"\"fontification.el\" release 20.1.0.\n\n"
"\"fontification.el\" release 20.1.1.\n\n"
";; Copyright (C) 2006 - 2020 H. Dieter Wilhelm.\n\n"
";; Version: 20.1.0\n"
";; Version: 20.1.1\n"
";; URL: https://github.com/dieter-wilhelm/apdl-mode\n"
";;; Commentary:\n"
";; Code for APDL command help and command completions.\n\n"
Expand Down
16 changes: 8 additions & 8 deletions helper/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
@echo "make ELC = compile the el files"
@echo "make ALL = MODE + EMACS + EMACS_SRC + TAGS"
@echo "make CLEAN = clean the elc files"
@echo "make TAG_RELEASE = "
# @echo "make TAG_RELEASE = "
@echo "make PACK = Emacs tar package"
@echo "make [help] = this help"
@echo "make -k = --keep-going, even if some targets can't be made.."

# Semantic versioning: MA.Mi.Pa
# Semantic versioning: MA.Mi.Pa, Ma = year
APDL_MAJOR := 20
APDL_MINOR := 1
APDL_PATCH := 0
APDL_PATCH := 1


# EMACS_VER needed for Emacs' windows installaion tree
Expand Down Expand Up @@ -156,6 +156,7 @@ $(PACKAGE) : $(PACKAGE_FILES) makefile
@test -d $(P_DIR)/doc || \
mkdir $(P_DIR)/doc
# @cp -a $(TUTORIALS) P_DIR/doc
@cp -a $(TUTORIAL_SOURCES) $(P_DIR)/doc
@cp -a $(HELPER_FILES) $(P_DIR)/doc
@test -d $(P_DIR)/helper || \
mkdir $(P_DIR)/helper
Expand All @@ -169,11 +170,10 @@ $(PACKAGE) : $(PACKAGE_FILES) makefile
@echo "... $@ done."
@echo "------------------------------"


# MODE: this is the Ansys mode "installation" package
# the sources are built from GitHub automatically when tagged
.PHONEY : PACK
PACK : $(PACKAGE)
PACK : $(PACKAGE) makefile

.PHONEY : CONTI
CONTI : A-M-$(VERSION).tar.xz
Expand Down Expand Up @@ -317,7 +317,7 @@ TAGS_FILES := makefile $(EL_FILES) $(FILES) $(TUTORIAL_SOURCES) fontification.el
TAGS : $(TAGS_FILES)
etags $(TAGS_FILES)

.PHONEY : TAG_RELEASE
TAG_RELEASE :
git tag release-$(VERSION)
#.PHONEY : TAG_RELEASE
#TAG_RELEASE :
# git tag release-$(VERSION)
# echo "git tag release-$(VERSION)"

0 comments on commit 99508a2

Please sign in to comment.