organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-3682 Resolve (#ifdef) the conflict with what is the os/400 fix and what was planned as the os/400 fix.

Browse source 
X-SVN-Rev: 15375
This commit is contained in:
George Rhoten 2004-05-18 18:42:44 +00:00
parent bc6990362b
commit 8166be666f
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
icu4c/source/tools/pkgdata/make.c
View file

@ -350,9 +350,17 @@ pkg_mak_writeObjRules(UPKGOptions *o, FileStream *makefile, CharList **objects,
} else {
tree[0] = 0;
}
#ifdef OS400
sprintf(stanza, "$(INVOKE) $(GENCCODE) -n $(CNAME)%s -d $(TEMP_DIR) $(SRCDIR)/%s", tree, infiles->str);
#else
sprintf(stanza, "$(INVOKE) $(GENCCODE) -n $(CNAME)%s -d $(TEMP_DIR) $<", tree);
#endif
} else {
#ifdef OS400
sprintf(stanza, "$(INVOKE) $(GENCCODE) -d $(TEMP_DIR) %s", infiles->str);
#else
sprintf(stanza, "$(INVOKE) $(GENCCODE) -d $(TEMP_DIR) $<");
#endif
}
if(o->numeric) {
@ -366,6 +374,18 @@ pkg_mak_writeObjRules(UPKGOptions *o, FileStream *makefile, CharList **objects,
commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
#ifdef OS400
/* This builds the file into one .c file */
sprintf(stanza, "@cat $(TEMP_PATH)%s >> $(TEMP_PATH)/$(NAME)all.c", cfile);
commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
sprintf(stanza, "@$(RMV) $(TEMP_DIR)/%s", cfile);
commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
T_FileStream_write(makefile, "\t", 1);
pkg_writeCharList(makefile, commands, "\n\t",0);
T_FileStream_write(makefile, "\n\n", 2);
#else
if(genFileOffset > 0) { /* for AS/400 */
sprintf(stanza, "@mv $(TEMP_PATH)%s $(TEMP_PATH)%s", cfile, cfile+genFileOffset);
commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
@ -379,6 +399,7 @@ pkg_mak_writeObjRules(UPKGOptions *o, FileStream *makefile, CharList **objects,
sprintf(stanza, "$(TEMP_PATH)%s", tmp+genFileOffset); /* for AS/400 */
pkg_mak_writeStanza(makefile, o, stanza, parents, commands);
#endif
pkg_deleteList(parents);
pkg_deleteList(commands);