X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2Fudibuild%2Fsrc%2Fmain.c;h=ff6b8f438a6fc1b798b69756bbc388b4342b0e10;hb=5a6a8c4210e3d8124f69bf5bede6ec144aaeddf4;hp=51ecbb5863506fc21b9f3cb5d545d49ed6073d57;hpb=699eb5715ccb595a544df82d8bb8bf2a17c38d32;p=tpg%2Facess2.git

diff --git a/Tools/udibuild/src/main.c b/Tools/udibuild/src/main.c
index 51ecbb58..ff6b8f43 100644
--- a/Tools/udibuild/src/main.c
+++ b/Tools/udibuild/src/main.c
@@ -16,10 +16,11 @@
 #include "include/inifile.h"
 #include "include/udiprops.h"
 
+#define CONFIG_FILENAME	"udibuild.ini"
 #ifdef __ACESS__
-#define CONFIG_FILE	"/Acess/Conf/UDI/udibuild.ini"
+#define RUNTIME_DIR	"/Acess/Conf/UDI"
 #else
-#define CONFIG_FILE	"/etc/udi/udibuild.ini"
+#define RUNTIME_DIR	"/etc/udi"
 #endif
 
 // === PROTOTYPES ===
@@ -28,6 +29,7 @@
 void	Usage(const char *progname);
 
 // === GLOBALS ===
+const char *gsRuntimeDir = RUNTIME_DIR;
 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 ) {
-			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);
@@ -63,11 +65,11 @@ int main(int argc, char *argv[])
 		//}
 	}
 	// 3. Check ~/.config/udi/udibuild.ini
-	// 4. Check CONFIGNAME
+	// 4. Check RUNTIME_DIR/udibuild.ini
 
 	// #. 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);
 	}
 	
@@ -87,7 +89,7 @@ int main(int argc, char *argv[])
 	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]);