git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tools/udibuild - Fixing linking
[tpg/acess2.git]
/
Tools
/
udibuild
/
src
/
main.c
diff --git
a/Tools/udibuild/src/main.c
b/Tools/udibuild/src/main.c
index
51ecbb5
..
ff6b8f4
100644
(file)
--- a/
Tools/udibuild/src/main.c
+++ b/
Tools/udibuild/src/main.c
@@
-16,10
+16,11
@@
#include "include/inifile.h"
#include "include/udiprops.h"
#include "include/inifile.h"
#include "include/udiprops.h"
+#define CONFIG_FILENAME "udibuild.ini"
#ifdef __ACESS__
#ifdef __ACESS__
-#define
CONFIG_FILE "/Acess/Conf/UDI/udibuild.ini
"
+#define
RUNTIME_DIR "/Acess/Conf/UDI
"
#else
#else
-#define
CONFIG_FILE "/etc/udi/udibuild.in
i"
+#define
RUNTIME_DIR "/etc/ud
i"
#endif
// === PROTOTYPES ===
#endif
// === PROTOTYPES ===
@@
-28,6
+29,7
@@
void Usage(const char *progname);
// === GLOBALS ===
void Usage(const char *progname);
// === GLOBALS ===
+const char *gsRuntimeDir = RUNTIME_DIR;
const char *gsOpt_ConfigFile;
const char *gsOpt_WorkingDir;
const char *gsOpt_UdipropsFile;
const char *gsOpt_ConfigFile;
const char *gsOpt_WorkingDir;
const char *gsOpt_UdipropsFile;
@@
-54,8
+56,8
@@
int main(int argc, char *argv[])
if( !gsOpt_ConfigFile && (argv[0][0] == '.' || argv[0][0] == '/') ) {
char *last_slash = strrchr(argv[0], '/');
if( last_slash ) {
if( !gsOpt_ConfigFile && (argv[0][0] == '.' || argv[0][0] == '/') ) {
char *last_slash = strrchr(argv[0], '/');
if( last_slash ) {
- gsOpt_ConfigFile = mkstr("%.*s/
udibuild.ini
",
- last_slash-argv[0], argv[0]);
+ gsOpt_ConfigFile = mkstr("%.*s/
%s
",
+ last_slash-argv[0], argv[0]
, CONFIG_FILENAME
);
}
//if( !file_exists(gsOpt_ConfigFile) ) {
// free(gsOpt_ConfigFile);
}
//if( !file_exists(gsOpt_ConfigFile) ) {
// free(gsOpt_ConfigFile);
@@
-63,11
+65,11
@@
int main(int argc, char *argv[])
//}
}
// 3. Check ~/.config/udi/udibuild.ini
//}
}
// 3. Check ~/.config/udi/udibuild.ini
- // 4. Check
CONFIGNAME
+ // 4. Check
RUNTIME_DIR/udibuild.ini
// #. Oh well
if( !gsOpt_ConfigFile ) {
// #. Oh well
if( !gsOpt_ConfigFile ) {
- fprintf(stderr, "Can't locate
udibuild.ini
file, please specify using '-c'\n");
+ fprintf(stderr, "Can't locate
"CONFIG_FILENAME"
file, please specify using '-c'\n");
exit(2);
}
exit(2);
}
@@
-87,7
+89,7
@@
int main(int argc, char *argv[])
assert(gpUdipropsBuild->SourceFiles);
// Do build
assert(gpUdipropsBuild->SourceFiles);
// Do build
- for( int i = 0;
gpUdipropsBuild->SourceFiles[i]
; i ++ )
+ for( int i = 0;
i < gpUdipropsBuild->nSourceFiles
; i ++ )
{
int rv = Build_CompileFile(gpOptions, gsOpt_ABIName, gpUdipropsBuild,
gpUdipropsBuild->SourceFiles[i]);
{
int rv = Build_CompileFile(gpOptions, gsOpt_ABIName, gpUdipropsBuild,
gpUdipropsBuild->SourceFiles[i]);
UCC
git Repository :: git.ucc.asn.au