Commit 57606bc0 authored by juan rodriguez-carvajal's avatar juan rodriguez-carvajal
Browse files

Reorganizing things for fpm. Now the different fpm.toml files are within the...

Reorganizing things for fpm. Now the different fpm.toml files are within the subdirectory toml and the script for building CrysFML copy the appropriate file to fpm.toml before building the library for console mode or Winteracter mode.
parent a7938265
Pipeline #12443 passed with stages
in 12 minutes and 32 seconds
......@@ -84,7 +84,7 @@
!---- List of public subroutines ----!
public :: Close_scroll_window, error_message, info_message, question_message, warning_message, &
stop_message, write_scroll_text, Wait_Message, Print_Message
stop_message, write_scroll_text
!---- Definitions ----!
......@@ -305,48 +305,4 @@
return
End Subroutine Write_Scroll_Text
!!----
!!---- Subroutine Print_Message(Mess)
!!---- character(len=*), intent(in) :: Mess ! In -> Print information
!!----
!!---- Print an message on the standard output. This subroutine is here for
!!---- compatibility with the console version of this module. It should not be
!!--- used in pure Winteracter programs.
!!
Subroutine Print_Message(Mess)
!---- Arguments ----!
character(len=*),intent(in) :: Mess
!---- Local Variables ----!
integer :: lon
lon=len_trim(mess)
if (lon == 0) then
write(unit=*,fmt="(a)") " "
else
if (mess(1:1) == "=" .or. mess(2:2) == "=") then
write(unit=*,fmt="(a)") mess(1:lon)
else
write(unit=*,fmt="(a,a)")" =>", mess(1:lon)
end if
end if
End Subroutine Print_Message
!!----
!!---- Subroutine Wait_Message(Mess)
!!---- character(len=*), optional, intent(in) :: Mess
!!----
!!---- Similar to Pause for Console version .This subroutine is here for
!!---- compatibility with the console version of this module. It should not be
!!--- used in pure Winteracter programs.
!!----
!!
Subroutine Wait_Message(Mess)
!---- Argument ----!
character(len=*), optional, intent(in) :: Mess
write(unit=*,fmt="(a)") " "
if (present(mess)) write(unit=*,fmt="(a)", advance="no") mess
End Subroutine Wait_Message
End Module CFML_IO_Messages
......@@ -27,6 +27,16 @@ rem > Arguments ----
shift
if not [%1]==[] goto LOOP
rem .
rem Select the proper fpm.toml file depending on win
rem .
if [%_WINT%]==[win] (
echo Copying .\toml\fpm_windows_win.toml to fpm.toml
copy .\toml\fpm_windows_win.toml fpm.toml
) else (
echo Copying .\toml\fpm_windows_con.toml to fpm.toml
copy .\toml\fpm_windows_con.toml fpm.toml
)
)
rem First change the extensions of files that are optionally used in fpm to "xxx" by
rem invoking the tochange.bat script in the Src directory.
cd .\Src
......
......@@ -11,14 +11,12 @@ copyright = "Copyright 2022, Juan Rodriguez-Carvajal, Javier Gonzalez-Platas, Ne
[library]
source-dir = "Src"
include-dir = "../../wint/lib.i64"
include-dir = "Src"
[build]
auto-executables = false
auto-tests = false
auto-examples = false
external-modules = "winteracter"
link=["winter","user32", "gdi32", "comdlg32", "winspool", "winmm", "shell32", "advapi32", "htmlhelp"]
[install]
library = true
......
# This is the manifest file for building CrysFML with fpm
# It is better to comment the part corresponding to executables in order to construct
# the library totally independent of the programs using it.
#
name = "CrysFML"
version = "1.0.0"
license = "LGPL"
author = "Juan Rodriguez-Carvajal, Javier Gonzalez-Platas, Nebil A. Katcho"
maintainer = "jrc@ill.eu"
copyright = "Copyright 2022, Juan Rodriguez-Carvajal, Javier Gonzalez-Platas, Nebil A. Katcho"
[library]
source-dir = "Src"
include-dir = "../../wint/lib.i64"
[build]
auto-executables = false
auto-tests = false
auto-examples = false
external-modules = "winteracter"
link=["winter","user32", "gdi32", "comdlg32", "winspool", "winmm", "shell32", "advapi32", "htmlhelp"]
[install]
library = true
#
# The lines above are enough for building the library using the scripts make_CrysFML_fpm.bat/make_CrysFML_fpm.sh
#
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment