From 5ee29d78b4c00fd1f64f31eacac94279cb48f241 Mon Sep 17 00:00:00 2001 From: dieter-wilhelm Date: Sat, 15 Feb 2020 18:31:37 +0100 Subject: [PATCH] Release 20.1.0 commit --- README.org | 39 ++++++++----- TODO.org | 24 ++++---- apdl-config.el | 146 +++++++++++++++++++++++++---------------------- apdl-config.org | 8 ++- apdl-template.el | 2 + helper/makefile | 140 ++++++++++++++++++++++++--------------------- 6 files changed, 197 insertions(+), 162 deletions(-) diff --git a/README.org b/README.org index 92bbdfd..7969365 100644 --- a/README.org +++ b/README.org @@ -1,5 +1,5 @@ #+STARTUP: all -#+DATE: Time-stamp: <2020-02-13> +#+DATE: Time-stamp: <2020-02-15> #+bind: org-html-preamble-format (("en" "%d")) #+OPTIONS: ':nil *:t -:t ::t <:t H:3 \n:nil ^:t arch:headline #+OPTIONS: author:t c:nil creator:comment d:(not "LOGBOOK") date:t @@ -50,14 +50,16 @@ Copyright (C) 2006 - 2020 H. Dieter Wilhelm, GPL V3 diminished. But APDL is here to stay: `WorkBench' and `AIM' operate exclusively the ANSYS solver with it! They are sending APDL input (.dat) files to the solver. For a true understanding of the GUIs' - inner workings a study of this APDL code is prerequisite. + inner workings a study of APDL code is prerequisite. Moreover the GUIs are not supporting all solver features. So APDL `Command Snippets' enhance the GUIs' modelling capabilities. * Some highlights - Nowadays I find APDL-Mode mostly useful in writing these `Command - Snippets' or reading snippets from colleagues. Or for studying - solver (.dat) files which are created by WorkBench. + Nowadays I find APDL-Mode mostly useful in writing `Command + Snippets' and inspecting longer snippets from other sources. + Likewise for studying solver (.dat) files which were created by + WorkBench. Alone APDL-Mode's support for rapidly accessing the + ANSYS APDL documentation is worth using it. ** In-built APDL command help with argument counter Especially for commands with a large number of arguments it is cumbersome to count the arguments, *C-?* facilitates this for you @@ -100,23 +102,34 @@ Copyright (C) 2006 - 2020 H. Dieter Wilhelm, GPL V3 # - APDL-Mode is now available on MELPA # For further installation options -1) Install [[https://www.gnu.org/software/emacs/][GNU-Emacs]] (if you are new to Emacs please check the - tutorial in the `Help' menu). -2) Install the APDL-Mode package (You need at least Emacs-25.1.) +1) Install [[https://www.gnu.org/software/emacs/][GNU-Emacs]] (if you are new to the Emacs editor please check + the tutorial in the `Help' menu, please really do it ;-). + +2) Download APDL-Mode's tar file from [[https://github.com/dieter-wilhelm/apdl-mode/releases/tag/20.1.0][Github]]: + +3) Install the APDL-Mode package (You need at least emacs-25.1.) + + Type `M-x package-install-file' and select the downloaded tar + package. + + # melpa, add the following in your GNU-Emacs init file: # (add-to-list 'package-archives # '("melpa" . "http://melpa.org/packages/") t) # Then do M-x package-list-packages, find apdl-mode and install it. + That's it. + For further installation options please have a look in the [[file:INSTALLATION.org][INSTALLATION]] file. + * Usage - Please type `M-x apdl' then you are in an APDL-Mode buffer and you - can check the menu bar's `APDL' or `ANSYS' entries. Please select - `Describe APDL-Mode' or type `C-h m', which will display the - APDL-Mode help with further guidance. + Please type `M-x apdl' which opens an APDL-Mode buffer and you can + inspect the menu bar's `APDL' or `ANSYS' entries. Please select + `Describe APDL-Mode' or type `C-h m', which will display APDL-Mode's + help with further guidance in using it. - You might check the introductory APDL-Mode tutorial + You might also check the introductory APDL-Mode tutorial ([[file:doc/A-M_introductory_tutorial.org][A-M_introductory_tutorial.org]]) for an overview as well. * Configuration and Customisation diff --git a/TODO.org b/TODO.org index e60ce5b..19545b2 100644 --- a/TODO.org +++ b/TODO.org @@ -1,4 +1,4 @@ -#+DATE: Time-stamp: <2020-02-14> +#+DATE: Time-stamp: <2020-02-15> #+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 @@ -15,31 +15,29 @@ #+STARTUP: showall * 20.1.0 -** bugs - - bug-report about package.el - Build package with makefile and add installation recipe, update INSTALLATION.org and do a 20.1.0 release - - M-? with too many commas throws an error - - The ANSYS menu enty is not working under Win10?? +** bugs + + - C-c C-b no warning, when -help-path is not initialised!!! + - M-? with too many commas throws an error, is message good enough? - The APDL menu entry in the terminal is not working => wrong type argument! - check highlighting of -license-type - - apdl command in sandbox not working <= autoload not working? + + - The ANSYS menu enty is not working under Win10?? + - apdl command in sandbox not working <= autoload not working?, done ** wishes + - Remove unnecessary tags from Github - Check customisation system - online documentation: still ANSYS-mode! - - Trigger the ANSYS online manual, if there's no local docu + - Trigger the ANSYS online manual, if there's no local docu for C-c C-b ** misc + - bug-report about package.el "NAME-readme.txt", done - package-lint - problems with prefix names and default key bindings... - are the material properties documented? - how about the work branch? - - Read the ansys manual in EWW => (setq browse-url-browser-function - 'eww-browse-url) I had to change the configuration of - apdl-ansys-help-path though: "/c:/CAx/App/ANSYS - Inc/v201/commonfiles/help/en-us/help/" (note the slash before c:! - whats going on here?) for chrome file:///c:/ is working as - well... - what is default.el <=> apdl-config.el?, dito. a-m.el!? - README (for package-el) README.org for github - ANSYS is often used synonymous for ANSYS MAPDL solver / diff --git a/apdl-config.el b/apdl-config.el index 73c5cae..4afcabc 100644 --- a/apdl-config.el +++ b/apdl-config.el @@ -4,6 +4,8 @@ ;; Copyright (C) 2016 - 20202 H. Dieter Wilhelm, GPL V3 +;;; Comentary: + ;; `apdl-config.el' can be used as a configuration file (after moving ;; it e. g. to `/usr/share/emacs/site-lisp' or ;; `c:\\EMACS_INSTALLDIR\\site-lisp'). Yet this file is then loaded @@ -16,7 +18,7 @@ ;; at least its corresponding sections) otherwise clashing settings in ;; `.emacs' will be overwritten!!! -;;; CONVENTIONS: +;;; Commentary: ;; The comment sign is `;' (one semi-colon ;) Textual hints are ;; indicated with DOUBLE semi-colons `;;', optionally uncomment the @@ -25,14 +27,14 @@ ;;; CODE: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; IMPORTANT PREREQUISIT + ;; IMPORTANT PREREQUISIT ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; !!! If the APDL-Mode files (*.el) are NOT placed in a default ;; Emacs load-path it is necessary to adjust the following ;; variable:!!! Hint: The directory site-lisp/ in the Emacs ;; installation tree, for example, is in its default load-path. -;; (add-to-list 'load-path "C:\\DIRECTORY-PATH\\WHERE\\THE\\APDL-MODE\\FILES\\RESIDE") +;(add-to-list 'load-path "C:\\DIRECTORY-PATH\\WHERE\\THE\\APDL-MODE\\FILES\\RESIDE") ;; for example: "c:\\emacs\\apdl-mode" for a Windows system or ;; "/usr/local/src/emacs/apdl-mode" for a GNU-Linux system. @@ -42,25 +44,25 @@ ;; ANSYS (if they are differing from the defaults and restart Emacs ;; ;-), the complete paths will be constructed with below information -;; (setq apdl-current-apdl-version "150") ; "162" default in APDL-Mode 162-1 +;(setq apdl-current-apdl-version "150") ; "162" default in APDL-Mode 162-1 -;; if `apdl-install-directory' is not set APDL-Mode tries to +;; if `apdl-ansys-install-directory' is not set APDL-Mode tries to ;; initialise it from the environment variable `AWP_ROOT162'. ;; conditional: Linux or Windows -;; (cond ((string= window-system "x") -;; ;; This is an example of an installation directory on GNU-Linux -;; (setq apdl-install-directory "/appl")) ; default: "/" -;; (t -;; ;;This an example of an installation dir. on WINDOWS -;; (setq apdl-install-directory "D:\\Ansys")) ; default: "C:\\Program Files" -;; ) +;(cond ((string= window-system "x") +; ;; This is an example of an installation directory on GNU-Linux +; (setq apdl-ansys-install-directory "/appl")) ; default: "/" +; (t +; ;;This an example of an installation dir. on WINDOWS +; (setq apdl-ansys-install-directory "D:\\Ansys")) ; default: "C:\\Program Files" +; ) ;; If the paths of your ANSYS installation is completely differing ;; from the normal ANSYS structures, please see below. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; IMPORTANT END + ;; IMPORTANT END ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -84,38 +86,38 @@ (add-to-list 'auto-mode-alist '("\\.anf$" . apdl-mode)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Auto insertion + ;; Auto insertion ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; auto insertion stuff (when creating a new APDL file) -(auto-insert-mode 1) ; insert automatically templates +(auto-insert-mode 1) ; insert automatically templates (add-hook 'find-file-hook 'auto-insert) ; when opening new files (setq auto-insert-query t) ; aks for auto insertion of APDL template (add-to-list 'auto-insert-alist - '(apdl-mode . [apdl-skeleton-outline-template])) ;which template to insert + '(apdl-mode . [apdl-skeleton-outline-template])) ;which template to insert ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Autoloading + ;; Autoloading ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Set of useful commands which are interactively available (M-x ...) ;; even when APDL Mode was not (yet) activated i.e. the lisp files not ;; loaded. -(autoload 'apdl "apdl-mode" "Opening an empty buffer in APDL-Mode" 'interactive) -(autoload 'apdl-mode "apdl-mode" "Switch to APDL-Mode" 'interactive) -(autoload 'apdl-customise-ansys "apdl-mode" "Activate the function for + (autoload 'apdl "apdl-mode" "Opening an empty buffer in APDL-Mode" 'interactive) + (autoload 'apdl-mode "apdl-mode" "Switch to APDL-Mode" 'interactive) + (autoload 'apdl-customise-ansys "apdl-mode" "Activate the function for calling a special ANSYS customisation buffer." 'interactive) -(autoload 'apdl-abort-file "apdl-mode" "Activate the function for aborting ANSYS runs." 'interactive) -(autoload 'apdl-display-error-file "apdl-mode" "Activate the function for inspecting the ANSYS error file." 'interactive) -(autoload 'apdl-start-apdl-help "apdl-mode" "Activate the function for starting the ANSYS help browser." 'interactive) -(autoload 'apdl-start-ansys "apdl-mode" "Activate the function for starting the APDL interpreter under GNU-Linux or product launcher under Windows." 'interactive) -(autoload 'apdl-start-classics "apdl-mode" "Activate the function for starting the MAPDL in GUI Mode (APDL-Classics)." 'interactive) -(autoload 'apdl-start-wb "apdl-mode" "Activate the function for starting Workbench." 'interactive) -(autoload 'apdl-license-status "apdl-mode" "Activate the function for displaying ANSYS license status or starting a license utility." 'interactive) -(autoload 'apdl-mode-version "apdl-mode" "Show APDL-Mode's version number." 'interactive) + (autoload 'apdl-abort-file "apdl-mode" "Activate the function for aborting ANSYS runs." 'interactive) + (autoload 'apdl-display-error-file "apdl-mode" "Activate the function for inspecting the ANSYS error file." 'interactive) + (autoload 'apdl-start-apdl-help "apdl-mode" "Activate the function for starting the ANSYS help browser." 'interactive) + (autoload 'apdl-start-ansys "apdl-mode" "Activate the function for starting the APDL interpreter under GNU-Linux or product launcher under Windows." 'interactive) + (autoload 'apdl-start-classics "apdl-mode" "Activate the function for starting the MAPDL in GUI Mode (APDL-Classics)." 'interactive) + (autoload 'apdl-start-wb "apdl-mode" "Activate the function for starting Workbench." 'interactive) + (autoload 'apdl-license-status "apdl-mode" "Activate the function for displaying ANSYS license status or starting a license utility." 'interactive) + (autoload 'apdl-mode-version "apdl-mode" "Show APDL-Mode's version number." 'interactive) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Outlining + ;; Outlining ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; activating outline minor mode for selectively hiding/unhiding ;; sections @@ -123,7 +125,7 @@ (add-hook 'apdl-mode-hook 'apdl-outline-minor-mode) ;enable outlining ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Highlighting/Colourisation + ;; Highlighting/Colourisation ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; The following toggles a dynamics change of the highlighting: While @@ -134,8 +136,8 @@ ;; files (but only when apdl-highlighting-level is set to 2, see ;; below). -;; (setq apdl-dynamic-highlighting-flag nil) -;; (setq apdl-dynamic-highlighting-flag t) ;default +;(setq apdl-dynamic-highlighting-flag nil) +;(setq apdl-dynamic-highlighting-flag t) ;default ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; fontification (highlighting) of user variables and decoration @@ -143,69 +145,75 @@ ;; in level 2 available (statical, if above flag is not set), the ;; default is 2 -;; (setq apdl-highlighting-level 1) ; default: 2 +;(setq apdl-highlighting-level 1) ; default: 2 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ANSYS version and paths + ;; ANSYS version and paths ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Things you might have to configure if your ANSYS installation is ;; completely differing from default ANSYS installation paths, as in ;; the example below: -;; (setq apdl-help-program -;; "/appl/ansys_inc/16.2.0/v162/commonfiles/help/HelpViewer/ANSYSHelpViewer.exe") -;; ;;the ANSYS path to the help viewer looks normally like this: -;; ;; "/INSTALL_DIRECTORY/ansys_inc/v162/commonfiles/help/HelpViewer/ANSYSHelpViewer.exe" -;; (setq apdl-help-path "/appl/ansys_inc/16.2.0/v162/commonfiles/help/en-us/help/") -;; (setq apdl-program "/appl/ansys_inc/16.2.0/v162/ansys/bin/ansys162") -;; (setq apdl-lmutil-program "/appl/ansys_inc/16.2.0/shared_files/licensing/linx64/lmutil") +; (setq apdl-help-program +; "/appl/ansys_inc/16.2.0/v162/commonfiles/help/HelpViewer/ANSYSHelpViewer.exe") +; ;;the ANSYS path to the help viewer looks normally like this: +; ;; "/INSTALL_DIRECTORY/ansys_inc/v162/commonfiles/help/HelpViewer/ANSYSHelpViewer.exe" +;; ;; on windows systems (note the slash before c:!) +;; (setq apdl-ansys-help-path "/c:/Program Files/ANSYS Inc/16.2.0/v162/commonfiles/help/en-us/help/") + +; (setq apdl-ansys-help-path "/appl/ansys_inc/16.2.0/v162/commonfiles/help/en-us/help/") +; (setq apdl-ansys-program "/appl/ansys_inc/16.2.0/v162/ansys/bin/ansys162") +; (setq apdl-lmutil-program "/appl/ansys_inc/16.2.0/shared_files/licensing/linx64/lmutil") + +;; if you want to read the manual in GNU-Emacs' EWW browser +;(setq browse-url-browser-function 'eww-browse-url) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ANSYS processes stuff + ;; ANSYS processes stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; license server configuration + ;; license server configuration -;; GNU-Linux 64 bit only !!! Warning specifiying many license server -;; takes a long time for displaying the license status!!! + ;; GNU-Linux 64 bit only !!! Warning specifiying many license server + ;; takes a long time for displaying the license status!!! -;; for starting the solver & apdl-license-status & ANSYS help -;; (setq ; -;; license servers (or license file name)nn -;; specify even the default port for lmutil (since ANSYS V 12.0) on GNU-Linux -;; GNU-Linux: License servers separated by colons (":"), 1055 is the default port -;; apdl-license-file -;; "32002@ls_fr_ansyslmd_ww_1.conti.de" -;; "32002@ls_fr_ansyslmd_ww_1.conti.de:32002@ls_fr_ansyslmd_ww_2.conti.de:32002@ls_fr_ansyslmd_ww_4.conti.de:1055@frlifl01.auto.contiwan.com:1055@frlifl02.auto.contiwan.com" + ;; for starting the solver & apdl-license-status & ANSYS help +; (setq ; + ;; license servers (or license file name)nn + ;; specify even the default port for lmutil (since ANSYS V 12.0) on GNU-Linux + ;; GNU-Linux: License servers separated by colons (":"), 1055 is the default port +; apdl-license-file +; "32002@ls_fr_ansyslmd_ww_1.conti.de" +; "32002@ls_fr_ansyslmd_ww_1.conti.de:32002@ls_fr_ansyslmd_ww_2.conti.de:32002@ls_fr_ansyslmd_ww_4.conti.de:1055@frlifl01.auto.contiwan.com:1055@frlifl02.auto.contiwan.com" -;; since ANSYS 12.0 there is an intermediate server for -;; the communication between flexlm and ANSYS, 2325 is the default port -;; apdl-ansysli-servers -;; "2325@ls_fr_ansyslmd_ww_1.conti.de" -;; "2325@ls_fr_ansyslmd_ww_1.conti.de:2325@ls_fr_ansyslmd_ww_3.conti.de:2325@ls_fr_ansyslmd_ww_4.conti.de:2325@frlifl01.auto.contiwan.com:2325@frlifl02.auto.contiwan.com" -;; ) + ;; since ANSYS 12.0 there is an intermediate server for + ;; the communication between flexlm and ANSYS, 2325 is the default port +; apdl-ansysli-servers +; "2325@ls_fr_ansyslmd_ww_1.conti.de" +; "2325@ls_fr_ansyslmd_ww_1.conti.de:2325@ls_fr_ansyslmd_ww_3.conti.de:2325@ls_fr_ansyslmd_ww_4.conti.de:2325@frlifl01.auto.contiwan.com:2325@frlifl02.auto.contiwan.com" +; ) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; options when starting the solver + ;; options when starting the solver ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Number of cores for the run, 2 does not require HPC licenses -;; (setq apdl-no-of-processors 8) ;default: 2 + ;; Number of cores for the run, 2 does not require HPC licenses + ;(setq apdl-no-of-processors 8) ;default: 2 -;; which license type to use for the solver -;; (setq apdl-license "ansys") ;default: "struct" + ;; which license type to use for the solver + ;(setq apdl-license "ansys") ;default: "struct" -;; ANSYS job name -;; (setq apdl-job "otto"); default: "file" + ;; ANSYS job name + ;(setq apdl-job "otto"); default: "file" ;; adding the directory of this (loaded) file to the load-path (add-to-list 'load-path (file-name-directory load-file-name)) ;; setting the APDL-Mode install directory (setq apdl-mode-install-directory (file-name-directory load-file-name)) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; The End - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; The End +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; apdl-config.el ends here diff --git a/apdl-config.org b/apdl-config.org index 90c791e..645d867 100644 --- a/apdl-config.org +++ b/apdl-config.org @@ -1,4 +1,4 @@ -#+DATE: Time-stamp: <2020-02-13 15:41:15 uidg1626> +#+DATE: Time-stamp: <2020-02-14 22:28:34 dieter> #+bind: org-html-preamble-format (("en" "%d")) #+OPTIONS: ':nil *:t -:t ::t <:t H:3 \n:nil ^:{} arch:headline #+OPTIONS: author:t c:nil creator:comment d:(not "LOGBOOK") date:t @@ -400,6 +400,9 @@ example below: ;; normally it looks like this: ;; "/INSTALL_DIRECTORY/ansys_inc/v162/commonfiles/help/HelpViewer/ANSYSHelpViewer.exe" (setq apdl-ansys-help-path "/appl/ansys_inc/16.2.0/v162/commonfiles/help/en-us/help/") + ;; on windows systems (note the slash before c:!) + (setq apdl-ansys-help-path "/c:/Program Files/ANSYS Inc/16.2.0/v162/commonfiles/help/en-us/help/") + (setq apdl-ansys-program "/appl/ansys_inc/16.2.0/v162/ansys/bin/ansys162") (setq apdl-lmutil-program "/appl/ansys_inc/16.2.0/shared_files/licensing/linx64/lmutil") @@ -421,6 +424,9 @@ example below: ; "/appl/ansys_inc/16.2.0/v162/commonfiles/help/HelpViewer/ANSYSHelpViewer.exe") ; ;;the ANSYS path to the help viewer looks normally like this: ; ;; "/INSTALL_DIRECTORY/ansys_inc/v162/commonfiles/help/HelpViewer/ANSYSHelpViewer.exe" + ;; ;; on windows systems (note the slash before c:!) + ;; (setq apdl-ansys-help-path "/c:/Program Files/ANSYS Inc/16.2.0/v162/commonfiles/help/en-us/help/") + ; (setq apdl-ansys-help-path "/appl/ansys_inc/16.2.0/v162/commonfiles/help/en-us/help/") ; (setq apdl-ansys-program "/appl/ansys_inc/16.2.0/v162/ansys/bin/ansys162") ; (setq apdl-lmutil-program "/appl/ansys_inc/16.2.0/shared_files/licensing/linx64/lmutil") diff --git a/apdl-template.el b/apdl-template.el index dbda700..daee267 100644 --- a/apdl-template.el +++ b/apdl-template.el @@ -59,6 +59,8 @@ ;;; --- functions --- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(declare-function apdl-mode "apdl-mode") + (defun apdl-display-skeleton (&optional arg) ;NEW "Display or insert code templates. With an argument ARG not equal to 1 insert the template into the diff --git a/helper/makefile b/helper/makefile index c36b1bb..14212c5 100644 --- a/helper/makefile +++ b/helper/makefile @@ -1,51 +1,51 @@ -help : - @echo "This is the makefile of ANSYS-Mode $(VERSION) using $(EMACS_VERSION)" + help : + @echo "This is the makefile of APDL-Mode $(VERSION) using $(EMACS_VERSION)" @echo "make MODE = A-M package files + tutorials" @echo "make EMACS_SRC = Emacs sources + A-M package files + tutorials" @echo "make EMACS = Windoze version of emacs with pre-configured ANSYS-Mode" @echo "make CONTI = Archive for my company" @echo "make HTML = update the html documentation" - @echo "make TAGS = make the goddam tags!" + @echo "make TAGS = make the etags" @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 "" + @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 +APDL_MAJOR := 20 +APDL_MINOR := 1 +APDL_PATCH := 0 + # EMACS_VER needed for Emacs' windows installaion tree -EMACS_VER := 24.5 +EMACS_VER := 26.3 EMACS_VERSION := emacs-$(EMACS_VER) # complete package names are comprised of -# ansys-mode-$(ANSYS_MAJOR).$(ANSYS_MINOR).$(MODE_VERSION) + +# apdl-mode-$(APDL_MAJOR).$(ANSYS_MINOR).$(MODE_VERSION) # tutorials: A-M_xxx -ANSYS_MAJOR := 16 -ANSYS_MINOR := 2 - -# this is the current ANSYS-Mode version suffix -MODE_VERSION := test1 -# for consistency: -#MODE_VERSION := test1 -#MODE_VERSION := beta1 -#MODE_VERSION := freeze1 -#MODE_VERSION := rc1 -#MODE_VERSION := 1 ################################################## HOSTNAME := $(shell hostname) DIR := $(shell pwd) +# the sources dir +S_DIR := "/home/dieter/ansys-mode/" # use make in the "tags" release directories #RELEASE := $(shell $$($(DIR))) -ifeq ($(HOSTNAME),urmel) - EMACS_DIR := /usr/local/src/ +ifeq ($(HOSTNAME),ping) + EMACS_DIR := /usr/local/src/emacs/ else EMACS_DIR := /appl/emacs/ endif -VERSION := $(ANSYS_MAJOR)$(ANSYS_MINOR)-$(MODE_VERSION) +VERSION := $(APDL_MAJOR).$(APDL_MINOR).$(APDL_PATCH) EMACS_PACKAGE := $(EMACS_VERSION)-bin-i686-mingw32.zip # in the ftp.gnu.org/gnu folder is the gnu-keyring.gpg @@ -74,31 +74,31 @@ X11_EXE := $(X11_FILES:.cpp=) .PHONEY : TEST TEST : - @echo $(X11_EXE) + @echo $(VERSION) .PHONEY : ../X11 X11 : $(X11_FILES) $(MAKE) -C X11 -PACKAGE := ansys-mode-$(VERSION).tar.xz +PACKAGE := apdl-mode-$(VERSION).tar # necessary el files -EL_FILES := ../ansys-config.el ../ansys-mode.el ../ansys-keyword.el \ - ../ansys-initialise.el ../ansys-template.el ../ansys-process.el +EL_FILES := ../apdl-config.el ../apdl-mode.el ../apdl-keyword.el ../apdl-mode-pkg.el \ + ../apdl-initialise.el ../apdl-template.el ../apdl-process.el # fontification.el is not included since it is not necessary for running A-M -../ansys-config.el : ../ansys-config.org +../apdl-config.el : ../apdl-config.org $(EMACS_EXE) --batch --file $< \ - --execute "(add-to-list 'load-path \"~/a-m\")" \ - --load "ansys-mode.el" --execute "(org-babel-tangle)" + --execute "(add-to-list 'load-path \"~/ansys-mode\")" \ + --load "apdl-mode.el" --execute "(org-babel-tangle)" ELC_FILES := $(EL_FILES:.el=.elc) -# compiled files +# compile Elisp files .PHONEY : ELC ELC : $(ELC_FILES) -FILES := ../LICENSE.org ../README.org ../TODO.org ../NEWS.org ../INSTALLATION.org +FILES := ../LICENSE.org ../README ../README.org ../TODO.org ../NEWS.org ../INSTALLATION.org HELPER_FILES := ../doc/example.mac ../doc/example.anf ../doc/example.dat # ../doc/APDL_tutorial.ans @@ -108,7 +108,7 @@ HELPER_FILES := ../doc/example.mac ../doc/example.anf ../doc/example.dat # $< -eval "(require 'ob-tangle)" -eval "(org-babel-tangle nil "APDL_tutorial.ans")" WORK_FILES := ../LICENSE.org ../README.org ../TODO.org ../NEWS.org \ - example.mac example.anf example.dat tools/ansys-mode/README.Conti + example.mac example.anf example.dat # tools/ansys-mode/README.Conti WORK_EL_FILES := $(EL_FILES) @@ -135,66 +135,71 @@ X11 := \ ../X11/xSendReturn.cpp \ -PACKAGE_FILES := $(X11) $(FILES) $(HELPER_FILES) $(EL_FILES) $(MATLIB) $(TUTORIALS) default.el +# PACKAGE_FILES := $(X11) $(FILES) $(HELPER_FILES) $(EL_FILES) $(MATLIB) $(TUTORIALS) default.el +PACKAGE_FILES := $(FILES) $(HELPER_FILES) $(EL_FILES) $(MATLIB) default.el : makefile - @echo ";;; Automatically created from ANSYS-mode-$(VERSION)" > $@ + @echo ";;; Automatically created from APDL-Mode-$(VERSION)" > $@ @echo "(let* ((dir (file-name-directory load-file-name))" >> $@ - @echo " (file (concat dir \"/ansys-mode-$(VERSION)/ansys-config.el\")))" >> $@ + @echo " (file (concat dir \"/apdl-mode-$(VERSION)/apdl-config.el\")))" >> $@ @echo " (when (file-readable-p file) (load-file file)))" >> $@ -$(PACKAGE) : $(PACKAGE_FILES) makefile - @echo "Packaging $@ ..." +P_DIR := apdl-mode-$(VERSION) + +$(PACKAGE) : $(PACKAGE_FILES) makefile + @echo "Packaging GNU-Emacs package $@ ..." @echo - @test -d ansys-mode-$(VERSION) || \ - mkdir ansys-mode-$(VERSION) - @cp -a $(FILES) ansys-mode-$(VERSION) - @cp -a $(EL_FILES) ansys-mode-$(VERSION) - @test -d ansys-mode-$(VERSION)/doc || \ - mkdir ansys-mode-$(VERSION)/doc - @cp -a $(TUTORIALS) ansys-mode-$(VERSION)/doc - @cp -a $(HELPER_FILES) ansys-mode-$(VERSION)/doc - @test -d ansys-mode-$(VERSION)/helper || \ - mkdir ansys-mode-$(VERSION)/helper - @test -d ansys-mode-$(VERSION)/matlib || \ - mkdir ansys-mode-$(VERSION)/matlib - @test -d ansys-mode-$(VERSION)/X11 || \ - mkdir ansys-mode-$(VERSION)/X11 - @cp -rf $(MATLIB) ansys-mode-$(VERSION) - @tar -cJvf $@ ansys-mode-$(VERSION) default.el + @test -d $(P_DIR) || \ + mkdir $(P_DIR) + @cp -a $(FILES) $(P_DIR) + @cp -a $(EL_FILES) $(P_DIR) + @test -d $(P_DIR)/doc || \ + mkdir $(P_DIR)/doc +# @cp -a $(TUTORIALS) P_DIR/doc + @cp -a $(HELPER_FILES) $(P_DIR)/doc + @test -d $(P_DIR)/helper || \ + mkdir $(P_DIR)/helper + @test -d $(P_DIR)/matlib || \ + mkdir $(P_DIR)/matlib +# @test -d P_DIR/X11 || \ +# mkdir P_DIR/X11 + @cp -rf $(MATLIB) $(P_DIR) + tar -cf $@ $(P_DIR) # ../apdl-mode-readme.txt # default.el @echo @echo "... $@ done." @echo "------------------------------" + # MODE: this is the Ansys mode "installation" package # the sources are built from GitHub automatically when tagged -.PHONEY : MODE -MODE : $(PACKAGE) +.PHONEY : PACK +PACK : $(PACKAGE) .PHONEY : CONTI CONTI : A-M-$(VERSION).tar.xz -A-M-$(VERSION).tar.xz : $(PACKAGE) tools/ansys-mode/README.Conti tools/bin/A-M-$(VERSION).sh \ +A-M-$(VERSION).tar.xz : $(PACKAGE) \ # tools/apdl-mode/README.Conti + tools/bin/A-M-$(VERSION).sh \ makefile $(X11) - mv tools/ansys-mode/README.Conti tools/ - rm -fr tools/ansys-mode/* - mv tools/README.Conti tools/ansys-mode/ - @test -d tools/ansys-mode/ansys-mode-$(VERSION) || \ - mkdir tools/ansys-mode/ansys-mode-$(VERSION) +# mv tools/apdl-mode/README.Conti tools/ + rm -fr tools/apdl-mode/* +# mv tools/README.Conti tools/apdl-mode/ + @test -d tools/apdl-mode/apdl-mode-$(VERSION) || \ + mkdir tools/apdl-mode/apdl-mode-$(VERSION) @echo "syncing.." cd ..;rsync -aR --exclude '*~' $(WORK_EL_FILES:../%=%) $(FILES:../%=%) \ $(TUTORIALS:../%=%) X11/ \ $(MATLIB:../%=%) $(HELPER_FILES:../%=%) $(X11_EXE:../%=%)\ - helper/tools/ansys-mode/ansys-mode-$(VERSION) + helper/tools/apdl-mode/apdl-mode-$(VERSION) @pwd - cd ./tools/ansys-mode; ln -sf ansys-mode-$(VERSION) current + cd ./tools/apdl-mode; ln -sf apdl-mode-$(VERSION) current tar -cJvf $@ --group HPCUser_1 tools tools/bin/A-M-$(VERSION).sh : makefile @test -d tools/bin || mkdir tools/bin @echo "#!/bin/sh " > $@ - @echo "# Automatically created from ANSYS-mode-$(VERSION)" >> $@ - @echo "emacs -l /appl/tools/ansys-mode/ansys-mode-$(VERSION)/ansys-config.el \$$*" >> $@ + @echo "# Automatically created from APDL-Mode-$(VERSION)" >> $@ + @echo "emacs -l /appl/tools/apdl-mode/apdl-mode-$(VERSION)/ansys-config.el \$$*" >> $@ chmod +x $@ .PHONEY : EMACS_SRC @@ -260,15 +265,18 @@ $(EMACS_EXE) : $(EMACS_SOURCE) ../doc/A-M_introductory_tutorial.pdf : ../doc/A-M_introductory_tutorial.org $(EMACS_EXE) --batch --file $< \ - --load "~/a-m/helper/export.el" \ + --load "~/ansys-mode/helper/export.el" \ --execute "(org-beamer-export-to-pdf)" ../ansys-keyword.el : fontification.el ansys_dynprompt.txt ansys_elements.txt ansys_parametric_functions.txt ansys_get_functions.txt ansys_keywords.txt $(EMACS_EXE) --batch --load $< ln -f ansys-keyword.el .. +# this is for compiling Elisp files, we need to set the load-path for a pristine Emacs +# -f means --funcall +# -L means --directory prepend to load-path %.elc : %.el - $(EMACS_EXE) --batch -f batch-byte-compile $< + $(EMACS_EXE) --batch -L $(S_DIR) -f batch-byte-compile $< # This is Emacs for Windows packaged with Ansys mode .PHONEY : EMACS @@ -304,7 +312,7 @@ $(EMACS_PACKAGE) : $(EMACS_PACKAGE_SIG) gpg $(EMACS_PACKAGE_SIG) # need the org files for the versioning string -TAGS_FILES := makefile $(EL_FILES) $(FILES) $(TUTORIAL_SOURCES) fontification.el tools/ansys-mode/README.Conti ../ansys-config.org +TAGS_FILES := makefile $(EL_FILES) $(FILES) $(TUTORIAL_SOURCES) fontification.el ../apdl-config.org TAGS : $(TAGS_FILES) etags $(TAGS_FILES)