Prepare 2.1.1r1 release

Makefile.mos

@@ -12,7 +12,7 @@ LiteXL_OBJ := \
 	 src/api/dirmonitor/mos.o
 
 
-outfile := lite
+outfile := lite-xl
 compiler := gcc
 cxxcompiler := g++
 
@@ -34,8 +34,6 @@ LiteXL: $(LiteXL_OBJ)
 	@echo "Linking LiteXL"
 	@$(cxxcompiler) -o $(outfile) $(LiteXL_OBJ) $(LFLAGS)
 
-
-
 .c.o:
 	@echo "Compiling $<"
 	@$(compiler) -c $< -o $*.o $(CFLAGS) $(INCPATH) $(DFLAGS)
@@ -65,8 +63,6 @@ src/api/utf8.o: src/api/utf8.c
 
 src/api/dirmonitor/mos.o: src/api/dirmonitor/mos.c
 
-
-
 release: clean LiteXL
 	@echo "Creating release files..."
 	@mkdir -p release/LiteXL2
@@ -74,8 +70,8 @@ release: clean LiteXL
 	@mv release/LiteXL2/LiteXL2.info release/
 	@cp data release/LiteXL2/ -r
 	@cp changelog.md release/LiteXL2/
-	@cp lite release/LiteXL2/
+	@cp $(outfile) release/LiteXL2/
-	@strip release/LiteXL2/lite
+	@strip release/LiteXL2/$(outfile)
 	@cp README.md release/LiteXL2/
 	@cp README_Amiga.md release/LiteXL2/
 	@cp LICENSE release/LiteXL2/
@@ -83,4 +79,3 @@ release: clean LiteXL
 	@lha -aeqr3 a LiteXL2_MOS.lha release/
 	@echo "Clean release files..."
 	@delete release ALL QUIET FORCE
-

Makefile.os4

@@ -11,7 +11,7 @@ LiteXL_OBJ := \
 	 src/api/utf8.o src/platform/amigaos4.o \
 	 src/api/dirmonitor/os4.o
 
-outfile := lite
+outfile := lite-xl
 compiler := gcc-11
 cxxcompiler := g++-11
 
@@ -80,15 +80,17 @@ src/api/utf8.o: src/api/utf8.c
 
 src/api/dirmonitor/os4.o: src/api/dirmonitor/os4.c
 
-release:
+src/api/process.o: src/api/process.c
+
+release: clean LiteXL
 	@echo "Creating release files..."
 	@mkdir -p release/LiteXL2
 	@cp -r release_files/* release/LiteXL2/
 	@mv release/LiteXL2/LiteXL2.info release/
 	@cp -r data release/LiteXL2/
 	@cp changelog.md release/LiteXL2/
-	@cp lite release/LiteXL2/
+	@cp $(outfile) release/LiteXL2/
-	@strip release/LiteXL2/lite
+	@strip release/LiteXL2/$(outfile)
 	@cp README.md release/LiteXL2/
 	@cp README_Amiga.md release/LiteXL2/
 	@cp LICENSE release/LiteXL2/

README_Amiga.md

@@ -215,13 +215,13 @@ https://git.walkero.gr/walkero/lite-xl/issues
 
 # Changelog
 
-## [2.1.1r1] - 2022-01-08
+## [2.1.1r1] - 2022-01-29
 ### Changed
-- Synced the code with the latest upstream master branch, which means that
+- Binary name changed to lite-xl
-  this version is based on the latest available source
-- Compiled with SDL 2.26
 - Updated the colour themes and the plugins that are included in the release
-- Compiled with gcc 11 on AmigaOS 4
+- Compiled with latest SDL 2.26
+- Compiled with gcc 11
+- Synced the code with the upstream master branch at 8th January 2023
 
 ### Fixed
 - Set the default locale on AmigaOS 4, so as to fix some issues with decimal
@@ -284,7 +284,6 @@ https://git.walkero.gr/walkero/lite-xl/issues
 ### Fixed
 - Fixed the usage of NumPad (reported by root)
 
-
 ## [2.0.3r1] - 2022-03-30
 ### Changed
 - Applied all the necessary changes to make it run under AmigaOS 4.1 FE

src/api/dirmonitor/mos.c

@@ -6,4 +6,5 @@ int get_changes_dirmonitor(struct dirmonitor_internal* monitor, char* buffer, si
 int translate_changes_dirmonitor(struct dirmonitor_internal* monitor, char* buffer, int size, int (*callback)(int, const char*, void*), void* data) { return -1; }
 int add_dirmonitor(struct dirmonitor_internal* monitor, const char* path) { return -1; }
 void remove_dirmonitor(struct dirmonitor_internal* monitor, int fd) { }
+int get_mode_dirmonitor() { return 1; }
 

src/api/process.c

@@ -19,6 +19,9 @@
   #include <sys/types.h>
   #include <sys/wait.h>
 #endif
+#if defined(__amigaos4__)
+  #include "platform/amigaos4.h"
+#endif
 
 #define READ_BUF_SIZE 2048
 

src/main.c

@@ -8,7 +8,7 @@
 #include <signal.h>
 
 #if defined(__amigaos4__) || defined(__morphos__)
-#define VSTRING     "Lite XL 2.1.1r1 (08.01.2023)"
+#define VSTRING     "Lite XL 2.1.1r1 (29.01.2023)"
 #define VERSTAG     "\0$VER: " VSTRING
 #endif
 
@@ -62,7 +62,7 @@ static void get_exe_filename(char *buf, int sz) {
   _NSGetExecutablePath(exepath, &size);
   realpath(exepath, buf);
 #elif defined(__amigaos4__) || defined(__morphos__)
-  strcpy(buf, _fullpath("./lite"));
+  strcpy(buf, _fullpath("./lite-xl"));
 #elif __FreeBSD__
   size_t len = sz;
   const int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };

src/platform/amigaos4.c

@@ -2,7 +2,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#if defined(PROFYLER)
 #include <profyle.h>
+#endif
 
 #include "amigaos4.h"
 
@@ -43,10 +46,10 @@ char *_fullpath(const char *path)
 
   strcpy(prvPath, path);
 
-  if (!strcmp(path, "./lite"))
+  if (!strcmp(path, "./lite-xl"))
   {
     // TODO: Add code to get the name of the executable
-    if (getFullPath("PROGDIR:lite", result)) 
+    if (getFullPath("PROGDIR:lite-xl", result))
     {
       return result;
     }
@@ -67,4 +70,3 @@ char *_fullpath(const char *path)
 
   return NULL;
 }
-

src/platform/amigaos4.h

@@ -9,4 +9,3 @@ char *_fullpath(const char *);
 
 
 #endif
-

src/platform/morphos.c

@@ -41,10 +41,10 @@ char *_fullpath(const char *path)
 
   strcpy(prvPath, path);
 
-  if (!strcmp(path, "./lite"))
+  if (!strcmp(path, "./lite-xl"))
   {
     // TODO: Add code to get the name of the executable
-    if (getFullPath("PROGDIR:lite", result)) 
+    if (getFullPath("PROGDIR:lite-xl", result))
     {
       return result;
     }