Commit 05c866b4 authored by ROOL's avatar ROOL 🤖

Makefile recreated from fragments

Detail:
  Resources phase no longer ran; and previously couldn't be converted due to having files in addition to Messages. Removed use of FetchMake and use shared makefiles now we have INSTRES_FILES.
  Removed TinyStubs support.

Version 0.44. Tagged as 'FTP-0_44'
parent 93441763
...@@ -15,37 +15,19 @@ ...@@ -15,37 +15,19 @@
# Makefile for FTP # Makefile for FTP
# #
OBJS = commands connect header processdir protocol readdata\ COMPONENT = FTP
rewrite ses_ctrl start status stop utils module RESFSDIR = ${RESDIR}${SEP}URL${SEP}${TARGET}
CMHGDEPENDS = module ses_ctrl readdata OBJS = commands connect header processdir protocol readdata\
CUSTOMRES = custom rewrite ses_ctrl start status stop utils module
IMGFILES = LocalRes:Dir LocalRes:DirGrey LocalRes:File LocalRes:FileGrey CMHGDEPENDS = module ses_ctrl readdata
RES_OBJ = CDEFINES = -D${SYSTEM} -DCOMPAT_INET4 -UTML ${OPTIONS}
SA_OBJS = ${OBJS} msgs CINCLUDES = -ITCPIPLibs:,C:Fetchers
DBG_OBJS = ${OBJS} msgs ROMCDEFINES = -DROM
CFLAGS = -Wp
INSTRES_FILES = Dir DirGrey File FileGrey
HDRS =
LIBS += ${FETCHLIB} ${NET4LIBS} ${ASMUTILS}
include C:Fetchers.FetchMake include CModule
#
# Bonus files beyond message translations
#
resources: resources_common LocalRes:Messages ${IMGFILES}
${CP} LocalRes:Dir ${RESFSDIR}.Dir ${CPFLAGS}
${CP} LocalRes:DirGrey ${RESFSDIR}.DirGrey ${CPFLAGS}
${CP} LocalRes:File ${RESFSDIR}.File ${CPFLAGS}
${CP} LocalRes:FileGrey ${RESFSDIR}.FileGrey ${CPFLAGS}
@echo ${COMPONENT}: resources copied to Messages module
#
# Package up more than just the message translations
#
od.msgs: o.msgs
${CP} o.msgs od.msgs ${CPFLAGS}
o.msgs: ${MERGEDMSGS} ${DIRS} ${IMGFILES}
${RESGEN} messages_file $@ LocalRes:Messages ${RES_PATH}.Messages \
LocalRes:Dir ${RES_PATH}.Dir \
LocalRes:DirGrey ${RES_PATH}.DirGrey \
LocalRes:File ${RES_PATH}.File \
LocalRes:FileGrey ${RES_PATH}.FileGrey
# Dynamic dependencies: # Dynamic dependencies:
/* (0.43) /* (0.44)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.43 #define Module_MajorVersion_CMHG 0.44
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 May 2013 #define Module_Date_CMHG 11 Jan 2020
#define Module_MajorVersion "0.43" #define Module_MajorVersion "0.44"
#define Module_Version 43 #define Module_Version 44
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "26 May 2013" #define Module_Date "11 Jan 2020"
#define Module_ApplicationDate "26-May-13" #define Module_ApplicationDate "11-Jan-20"
#define Module_ComponentName "FTP" #define Module_ComponentName "FTP"
#define Module_ComponentPath "castle/RiscOS/Sources/Networking/Fetchers/FTP"
#define Module_FullVersion "0.43" #define Module_FullVersion "0.44"
#define Module_HelpVersion "0.43 (26 May 2013)" #define Module_HelpVersion "0.44 (11 Jan 2020)"
#define Module_LibraryVersionInfo "0:43" #define Module_LibraryVersionInfo "0:44"
...@@ -40,29 +40,14 @@ ...@@ -40,29 +40,14 @@
#define CMHG_CONST const #define CMHG_CONST const
#endif #endif
/* TinySupport SWIs. This does not work if any library static data
* is used within the module. This means errno (__errno) and __ctype
* (as used by any macro call to is.... functions) If you re-enable
* this SWI call, this module will fail to work at all.
*/
#define NO_TINYSTUBS
#ifdef ROM
#ifndef NO_TINYSTUBS
static _kernel_oserror *__ROM;
#define TinySupport_Share (0x82c43)
#define TinySupport_Die (0x82c41)
#endif
#endif
#define NO_SUCH_SWI (0x1E6) #define NO_SUCH_SWI (0x1E6)
#define URL_PROTOCOL_REGISTER 0x83e20 #define URL_PROTOCOL_REGISTER 0x83e20
#define URL_PROTOCOL_DEREGISTER 0x83e21 #define URL_PROTOCOL_DEREGISTER 0x83e21
#ifndef ROM #ifndef ROM
extern int messages_file(void); extern int Resources(void); /* From resgen */
#endif #endif
#ifndef ROM #ifndef ROM
...@@ -160,12 +145,6 @@ _kernel_oserror *module_init(CMHG_CONST char *cmd_tail, int podule_base, void *p ...@@ -160,12 +145,6 @@ _kernel_oserror *module_init(CMHG_CONST char *cmd_tail, int podule_base, void *p
(void) podule_base; (void) podule_base;
(void) cmd_tail; (void) cmd_tail;
#ifdef ROM
#ifndef NO_TINYSTUBS
__ROM = _swix(TinySupport_Share, _IN(0), pw);
#endif
#endif
registered = 0; registered = 0;
module_check_os_version(); module_check_os_version();
...@@ -198,7 +177,7 @@ _kernel_oserror *module_init(CMHG_CONST char *cmd_tail, int podule_base, void *p ...@@ -198,7 +177,7 @@ _kernel_oserror *module_init(CMHG_CONST char *cmd_tail, int podule_base, void *p
} }
#ifndef ROM #ifndef ROM
e = _swix(ResourceFS_RegisterFiles, _IN(0), messages_file()); e = _swix(ResourceFS_RegisterFiles, _IN(0), Resources());
if (e) { if (e) {
(void) try_to_deregister(); (void) try_to_deregister();
return e; return e;
...@@ -214,7 +193,7 @@ _kernel_oserror *module_init(CMHG_CONST char *cmd_tail, int podule_base, void *p ...@@ -214,7 +193,7 @@ _kernel_oserror *module_init(CMHG_CONST char *cmd_tail, int podule_base, void *p
if (e) { if (e) {
#ifndef ROM #ifndef ROM
(void) _swix(ResourceFS_DeregisterFiles, _IN(0), messages_file()); (void) _swix(ResourceFS_DeregisterFiles, _IN(0), Resources());
#endif #endif
(void) try_to_deregister(); (void) try_to_deregister();
return e; return e;
...@@ -224,7 +203,7 @@ _kernel_oserror *module_init(CMHG_CONST char *cmd_tail, int podule_base, void *p ...@@ -224,7 +203,7 @@ _kernel_oserror *module_init(CMHG_CONST char *cmd_tail, int podule_base, void *p
if (e) { if (e) {
messages_file_close(); messages_file_close();
#ifndef ROM #ifndef ROM
(void) _swix(ResourceFS_DeregisterFiles, _IN(0), messages_file()); (void) _swix(ResourceFS_DeregisterFiles, _IN(0), Resources());
#endif #endif
(void) try_to_deregister(); (void) try_to_deregister();
return e; return e;
...@@ -239,7 +218,7 @@ _kernel_oserror *module_init(CMHG_CONST char *cmd_tail, int podule_base, void *p ...@@ -239,7 +218,7 @@ _kernel_oserror *module_init(CMHG_CONST char *cmd_tail, int podule_base, void *p
module_release_event_vector(pw); module_release_event_vector(pw);
messages_file_close(); messages_file_close();
#ifndef ROM #ifndef ROM
(void) _swix(ResourceFS_DeregisterFiles, _IN(0), messages_file()); (void) _swix(ResourceFS_DeregisterFiles, _IN(0), Resources());
#endif #endif
(void) try_to_deregister(); (void) try_to_deregister();
return e; return e;
...@@ -298,7 +277,7 @@ _kernel_oserror *module_kill(int fatal, int podule, void *pw) ...@@ -298,7 +277,7 @@ _kernel_oserror *module_kill(int fatal, int podule, void *pw)
module_release_event_vector(pw); module_release_event_vector(pw);
messages_file_close(); messages_file_close();
#ifndef ROM #ifndef ROM
(void) _swix(ResourceFS_DeregisterFiles, _IN(0), messages_file()); (void) _swix(ResourceFS_DeregisterFiles, _IN(0), Resources());
#endif #endif
ses_kill_all(); ses_kill_all();
...@@ -306,12 +285,6 @@ _kernel_oserror *module_kill(int fatal, int podule, void *pw) ...@@ -306,12 +285,6 @@ _kernel_oserror *module_kill(int fatal, int podule, void *pw)
(void) try_to_deregister(); (void) try_to_deregister();
#ifdef ROM
#ifndef NO_TINYSTUBS
if(!__ROM) _swix(TinySupport_Die, 0);
#endif
#endif
return NULL; return NULL;
} }
......
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