Index: branches/blackosx/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/blackosx/Chameleon.xcodeproj/project.pbxproj (revision 1532) +++ branches/blackosx/Chameleon.xcodeproj/project.pbxproj (revision 1533) @@ -649,6 +649,350 @@ 6DBAFFC313B0D4590047ED33 /* ufsmount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ufsmount.h; sourceTree = ""; }; 6DBAFFC413B0D4590047ED33 /* unistd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unistd.h; sourceTree = ""; }; 6DBAFFC513B0D4590047ED33 /* unwind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unwind.h; sourceTree = ""; }; + A3561C731413FD7800E9B51E /* auto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = auto.c; sourceTree = ""; }; + A3561C741413FD7800E9B51E /* auto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = auto.h; sourceTree = ""; }; + A3561C751413FD7800E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561C761413FD7800E9B51E /* cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cmd.c; sourceTree = ""; }; + A3561C771413FD7800E9B51E /* cmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cmd.h; sourceTree = ""; }; + A3561C781413FD7800E9B51E /* disk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = disk.c; sourceTree = ""; }; + A3561C791413FD7800E9B51E /* disk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disk.h; sourceTree = ""; }; + A3561C7A1413FD7800E9B51E /* fdisk.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fdisk.8; sourceTree = ""; }; + A3561C7B1413FD7800E9B51E /* fdisk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fdisk.c; sourceTree = ""; }; + A3561C7C1413FD7800E9B51E /* getrawpartition.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = getrawpartition.c; sourceTree = ""; }; + A3561C7D1413FD7800E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561C7E1413FD7800E9B51E /* mbr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mbr.c; sourceTree = ""; }; + A3561C7F1413FD7800E9B51E /* mbr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mbr.h; sourceTree = ""; }; + A3561C801413FD7800E9B51E /* mbrcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mbrcode.h; sourceTree = ""; }; + A3561C811413FD7800E9B51E /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = ""; }; + A3561C821413FD7800E9B51E /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = ""; }; + A3561C831413FD7800E9B51E /* opendev.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opendev.c; sourceTree = ""; }; + A3561C841413FD7800E9B51E /* part.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = part.c; sourceTree = ""; }; + A3561C851413FD7800E9B51E /* part.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = part.h; sourceTree = ""; }; + A3561C861413FD7800E9B51E /* user.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = user.c; sourceTree = ""; }; + A3561C871413FD7800E9B51E /* user.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = user.h; sourceTree = ""; }; + A3561C881413FD7800E9B51E /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = ""; }; + A3561C891413FD7800E9B51E /* openUp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = openUp.c; sourceTree = ""; }; + A3561C8A1413FD7800E9B51E /* dyldsymboltool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dyldsymboltool.c; sourceTree = ""; }; + A3561C8B1413FD7800E9B51E /* bdmesg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bdmesg.c; sourceTree = ""; }; + A3561CAC1414024C00E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561CAE1414024C00E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561CAF1414024C00E9B51E /* HelloWorld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HelloWorld.cpp; sourceTree = ""; }; + A3561CB11414024C00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561CB31414024C00E9B51E /* modules */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = modules; sourceTree = ""; }; + A3561CB81414024D00E9B51E /* __ashldi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __ashldi3.c; sourceTree = ""; }; + A3561CB91414024D00E9B51E /* __ashrdi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __ashrdi3.c; sourceTree = ""; }; + A3561CBA1414024D00E9B51E /* __clzsi2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __clzsi2.c; sourceTree = ""; }; + A3561CBB1414024D00E9B51E /* __divdi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __divdi3.c; sourceTree = ""; }; + A3561CBC1414024D00E9B51E /* __divsi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __divsi3.c; sourceTree = ""; }; + A3561CBD1414024D00E9B51E /* __lshrdi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __lshrdi3.c; sourceTree = ""; }; + A3561CBE1414024D00E9B51E /* __moddi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __moddi3.c; sourceTree = ""; }; + A3561CBF1414024D00E9B51E /* __modsi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __modsi3.c; sourceTree = ""; }; + A3561CC01414024D00E9B51E /* __udivdi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __udivdi3.c; sourceTree = ""; }; + A3561CC11414024D00E9B51E /* __udivmoddi4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __udivmoddi4.c; sourceTree = ""; }; + A3561CC21414024D00E9B51E /* __udivmodsi4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __udivmodsi4.c; sourceTree = ""; }; + A3561CC31414024D00E9B51E /* __udivsi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __udivsi3.c; sourceTree = ""; }; + A3561CC41414024D00E9B51E /* __umoddi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __umoddi3.c; sourceTree = ""; }; + A3561CC51414024D00E9B51E /* __umodsi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __umodsi3.c; sourceTree = ""; }; + A3561CC61414024D00E9B51E /* atexit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atexit.c; sourceTree = ""; }; + A3561CC71414024D00E9B51E /* atexit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = atexit.h; sourceTree = ""; }; + A3561CC81414024D00E9B51E /* atoi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atoi.c; sourceTree = ""; }; + A3561CC91414024D00E9B51E /* atol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atol.c; sourceTree = ""; }; + A3561CCA1414024D00E9B51E /* atoll.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atoll.c; sourceTree = ""; }; + A3561CCB1414024D00E9B51E /* atox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atox.c; sourceTree = ""; }; + A3561CCC1414024D00E9B51E /* bsearch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bsearch.c; sourceTree = ""; }; + A3561CCD1414024D00E9B51E /* calloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = calloc.c; sourceTree = ""; }; + A3561CCE1414024D00E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561CCF1414024D00E9B51E /* exit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exit.c; sourceTree = ""; }; + A3561CD01414024D00E9B51E /* jrand48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jrand48.c; sourceTree = ""; }; + A3561CD11414024D00E9B51E /* klibc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = klibc.c; sourceTree = ""; }; + A3561CD21414024D00E9B51E /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; + A3561CD31414024D00E9B51E /* limits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = limits.h; sourceTree = ""; }; + A3561CD41414024D00E9B51E /* lrand48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lrand48.c; sourceTree = ""; }; + A3561CD51414024D00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561CD61414024D00E9B51E /* memccpy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memccpy.c; sourceTree = ""; }; + A3561CD71414024D00E9B51E /* memchr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memchr.c; sourceTree = ""; }; + A3561CD81414024D00E9B51E /* memmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memmem.c; sourceTree = ""; }; + A3561CD91414024D00E9B51E /* memmove.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memmove.c; sourceTree = ""; }; + A3561CDA1414024D00E9B51E /* memrchr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memrchr.c; sourceTree = ""; }; + A3561CDB1414024D00E9B51E /* memswap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memswap.c; sourceTree = ""; }; + A3561CDC1414024D00E9B51E /* mrand48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrand48.c; sourceTree = ""; }; + A3561CDD1414024D00E9B51E /* nrand48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nrand48.c; sourceTree = ""; }; + A3561CDE1414024D00E9B51E /* onexit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = onexit.c; sourceTree = ""; }; + A3561CDF1414024D00E9B51E /* qsort.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qsort.c; sourceTree = ""; }; + A3561CE01414024D00E9B51E /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; + A3561CE11414024D00E9B51E /* seed48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = seed48.c; sourceTree = ""; }; + A3561CE21414024D00E9B51E /* sha1hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1hash.c; sourceTree = ""; }; + A3561CE31414024D00E9B51E /* snprintf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = snprintf.c; sourceTree = ""; }; + A3561CE41414024D00E9B51E /* srand48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = srand48.c; sourceTree = ""; }; + A3561CE51414024D00E9B51E /* sscanf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sscanf.c; sourceTree = ""; }; + A3561CE61414024D00E9B51E /* strcasecmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strcasecmp.c; sourceTree = ""; }; + A3561CE71414024D00E9B51E /* strdup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strdup.c; sourceTree = ""; }; + A3561CE81414024D00E9B51E /* strlcat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strlcat.c; sourceTree = ""; }; + A3561CE91414024D00E9B51E /* strncasecmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strncasecmp.c; sourceTree = ""; }; + A3561CEA1414024D00E9B51E /* strndup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strndup.c; sourceTree = ""; }; + A3561CEB1414024D00E9B51E /* strnlen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strnlen.c; sourceTree = ""; }; + A3561CEC1414024D00E9B51E /* strntoimax.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strntoimax.c; sourceTree = ""; }; + A3561CED1414024D00E9B51E /* strntoumax.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strntoumax.c; sourceTree = ""; }; + A3561CEE1414024D00E9B51E /* strpbrk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strpbrk.c; sourceTree = ""; }; + A3561CEF1414024D00E9B51E /* strsep.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strsep.c; sourceTree = ""; }; + A3561CF01414024D00E9B51E /* strtoimax.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtoimax.c; sourceTree = ""; }; + A3561CF11414024D00E9B51E /* strtok.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtok.c; sourceTree = ""; }; + A3561CF21414024D00E9B51E /* strtok_r.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtok_r.c; sourceTree = ""; }; + A3561CF31414024D00E9B51E /* strtol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtol.c; sourceTree = ""; }; + A3561CF41414024D00E9B51E /* strtoll.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtoll.c; sourceTree = ""; }; + A3561CF51414024D00E9B51E /* strtotimespec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtotimespec.c; sourceTree = ""; }; + A3561CF61414024D00E9B51E /* strtotimeval.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtotimeval.c; sourceTree = ""; }; + A3561CF71414024D00E9B51E /* strtotimex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtotimex.c; sourceTree = ""; }; + A3561CF81414024D00E9B51E /* strtoul.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtoul.c; sourceTree = ""; }; + A3561CF91414024D00E9B51E /* strtoull.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtoull.c; sourceTree = ""; }; + A3561CFA1414024D00E9B51E /* strtoumax.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtoumax.c; sourceTree = ""; }; + A3561CFB1414024D00E9B51E /* strtox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtox.c; sourceTree = ""; }; + A3561CFC1414024D00E9B51E /* strxspn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strxspn.c; sourceTree = ""; }; + A3561CFD1414024D00E9B51E /* strxspn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strxspn.h; sourceTree = ""; }; + A3561CFE1414024D00E9B51E /* version */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = version; sourceTree = ""; }; + A3561CFF1414024D00E9B51E /* vsnprintf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vsnprintf.c; sourceTree = ""; }; + A3561D001414024D00E9B51E /* vsscanf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vsscanf.c; sourceTree = ""; }; + A3561D011414024D00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561D021414024D00E9B51E /* MakeInc.dir */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MakeInc.dir; sourceTree = ""; }; + A3561D031414024D00E9B51E /* Modules.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Modules.txt; sourceTree = ""; }; + A3561D051414024D00E9B51E /* 915resolution.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 915resolution.c; sourceTree = ""; }; + A3561D061414024D00E9B51E /* 915resolution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 915resolution.h; sourceTree = ""; }; + A3561D071414024D00E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561D081414024D00E9B51E /* edid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = edid.c; sourceTree = ""; }; + A3561D0A1414024D00E9B51E /* edid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = edid.h; sourceTree = ""; }; + A3561D0B1414024D00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561D0C1414024D00E9B51E /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; + A3561D0D1414024D00E9B51E /* Resolution.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Resolution.c; sourceTree = ""; }; + A3561D0E1414024D00E9B51E /* shortatombios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shortatombios.h; sourceTree = ""; }; + A3561D101414024D00E9B51E /* abi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = abi.cpp; sourceTree = ""; }; + A3561D111414024D00E9B51E /* algorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = algorithm.cpp; sourceTree = ""; }; + A3561D121414024D00E9B51E /* associative_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = associative_base.cpp; sourceTree = ""; }; + A3561D131414024D00E9B51E /* bitset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bitset.cpp; sourceTree = ""; }; + A3561D141414024D00E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561D151414024D00E9B51E /* char_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = char_traits.cpp; sourceTree = ""; }; + A3561D161414024D00E9B51E /* complex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = complex.cpp; sourceTree = ""; }; + A3561D171414024D00E9B51E /* del_op.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = del_op.cpp; sourceTree = ""; }; + A3561D181414024D00E9B51E /* del_opnt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = del_opnt.cpp; sourceTree = ""; }; + A3561D191414024D00E9B51E /* del_opv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = del_opv.cpp; sourceTree = ""; }; + A3561D1A1414024D00E9B51E /* del_opvnt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = del_opvnt.cpp; sourceTree = ""; }; + A3561D1B1414024D00E9B51E /* deque.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deque.cpp; sourceTree = ""; }; + A3561D1C1414024D00E9B51E /* eh_alloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eh_alloc.cpp; sourceTree = ""; }; + A3561D1D1414024D00E9B51E /* eh_globals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eh_globals.cpp; sourceTree = ""; }; + A3561D1E1414024D00E9B51E /* exception.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exception.cpp; sourceTree = ""; }; + A3561D1F1414024D00E9B51E /* fstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fstream.cpp; sourceTree = ""; }; + A3561D201414024D00E9B51E /* func_exception.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = func_exception.cpp; sourceTree = ""; }; + A3561D221414024D00E9B51E /* algorithm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = algorithm; sourceTree = ""; }; + A3561D231414024D00E9B51E /* associative_base */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = associative_base; sourceTree = ""; }; + A3561D241414024D00E9B51E /* basic_definitions */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = basic_definitions; sourceTree = ""; }; + A3561D251414024D00E9B51E /* bitset */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bitset; sourceTree = ""; }; + A3561D261414024D00E9B51E /* cassert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cassert; sourceTree = ""; }; + A3561D271414024D00E9B51E /* cctype */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cctype; sourceTree = ""; }; + A3561D281414024D00E9B51E /* cerrno */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cerrno; sourceTree = ""; }; + A3561D291414024D00E9B51E /* cfloat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cfloat; sourceTree = ""; }; + A3561D2A1414024D00E9B51E /* char_traits */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = char_traits; sourceTree = ""; }; + A3561D2B1414024D00E9B51E /* climits */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = climits; sourceTree = ""; }; + A3561D2C1414024D00E9B51E /* clocale */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = clocale; sourceTree = ""; }; + A3561D2D1414024D00E9B51E /* cmath */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cmath; sourceTree = ""; }; + A3561D2E1414024D00E9B51E /* complex */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = complex; sourceTree = ""; }; + A3561D2F1414024D00E9B51E /* csetjmp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = csetjmp; sourceTree = ""; }; + A3561D301414024D00E9B51E /* csignal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = csignal; sourceTree = ""; }; + A3561D311414024D00E9B51E /* cstdarg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cstdarg; sourceTree = ""; }; + A3561D321414024D00E9B51E /* cstddef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cstddef; sourceTree = ""; }; + A3561D331414024D00E9B51E /* cstdio */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cstdio; sourceTree = ""; }; + A3561D341414024D00E9B51E /* cstdlib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cstdlib; sourceTree = ""; }; + A3561D351414024D00E9B51E /* cstring */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cstring; sourceTree = ""; }; + A3561D361414024D00E9B51E /* ctime */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ctime; sourceTree = ""; }; + A3561D371414024D00E9B51E /* cwchar */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cwchar; sourceTree = ""; }; + A3561D381414024D00E9B51E /* cwctype */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cwctype; sourceTree = ""; }; + A3561D391414024D00E9B51E /* deque */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = deque; sourceTree = ""; }; + A3561D3A1414024D00E9B51E /* exception */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = exception; sourceTree = ""; }; + A3561D3B1414024D00E9B51E /* fstream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fstream; sourceTree = ""; }; + A3561D3C1414024D00E9B51E /* func_exception */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = func_exception; sourceTree = ""; }; + A3561D3D1414024D00E9B51E /* functional */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = functional; sourceTree = ""; }; + A3561D3E1414024D00E9B51E /* iomanip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iomanip; sourceTree = ""; }; + A3561D3F1414024D00E9B51E /* ios */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ios; sourceTree = ""; }; + A3561D401414024D00E9B51E /* iosfwd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iosfwd; sourceTree = ""; }; + A3561D411414024D00E9B51E /* iostream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iostream; sourceTree = ""; }; + A3561D421414024D00E9B51E /* istream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = istream; sourceTree = ""; }; + A3561D431414024D00E9B51E /* istream_helpers */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = istream_helpers; sourceTree = ""; }; + A3561D441414024D00E9B51E /* iterator */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iterator; sourceTree = ""; }; + A3561D451414024D00E9B51E /* iterator_base */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iterator_base; sourceTree = ""; }; + A3561D461414024D00E9B51E /* limits */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = limits; sourceTree = ""; }; + A3561D471414024D00E9B51E /* list */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = list; sourceTree = ""; }; + A3561D481414024D00E9B51E /* locale */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = locale; sourceTree = ""; }; + A3561D491414024D00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561D4A1414024D00E9B51E /* map */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = map; sourceTree = ""; }; + A3561D4B1414024D00E9B51E /* map.old */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = map.old; sourceTree = ""; }; + A3561D4C1414024D00E9B51E /* memory */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = memory; sourceTree = ""; }; + A3561D4D1414024D00E9B51E /* new */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = new; sourceTree = ""; }; + A3561D4E1414024D00E9B51E /* numeric */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = numeric; sourceTree = ""; }; + A3561D4F1414024D00E9B51E /* ostream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ostream; sourceTree = ""; }; + A3561D501414024D00E9B51E /* ostream_helpers */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ostream_helpers; sourceTree = ""; }; + A3561D511414024D00E9B51E /* queue */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = queue; sourceTree = ""; }; + A3561D521414024D00E9B51E /* set */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = set; sourceTree = ""; }; + A3561D531414024D00E9B51E /* set.old */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = set.old; sourceTree = ""; }; + A3561D541414024D00E9B51E /* sstream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sstream; sourceTree = ""; }; + A3561D551414024D00E9B51E /* stack */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stack; sourceTree = ""; }; + A3561D561414024D00E9B51E /* stdexcept */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stdexcept; sourceTree = ""; }; + A3561D571414024D00E9B51E /* streambuf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = streambuf; sourceTree = ""; }; + A3561D581414024D00E9B51E /* string */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = string; sourceTree = ""; }; + A3561D591414024D00E9B51E /* string_iostream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = string_iostream; sourceTree = ""; }; + A3561D5A1414024D00E9B51E /* support */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = support; sourceTree = ""; }; + A3561D5B1414024D00E9B51E /* system_configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = system_configuration.h; sourceTree = ""; }; + A3561D5C1414024D00E9B51E /* type_traits */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = type_traits; sourceTree = ""; }; + A3561D5D1414024D00E9B51E /* typeinfo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = typeinfo; sourceTree = ""; }; + A3561D5E1414024D00E9B51E /* types */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = types; sourceTree = ""; }; + A3561D5F1414024D00E9B51E /* unwind-cxx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "unwind-cxx.h"; sourceTree = ""; }; + A3561D601414024D00E9B51E /* utility */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = utility; sourceTree = ""; }; + A3561D611414024D00E9B51E /* valarray */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = valarray; sourceTree = ""; }; + A3561D621414024D00E9B51E /* vector */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vector; sourceTree = ""; }; + A3561D631414024D00E9B51E /* iomanip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iomanip.cpp; sourceTree = ""; }; + A3561D641414024D00E9B51E /* ios.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ios.cpp; sourceTree = ""; }; + A3561D651414024D00E9B51E /* iostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iostream.cpp; sourceTree = ""; }; + A3561D661414024D00E9B51E /* istream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = istream.cpp; sourceTree = ""; }; + A3561D671414024D00E9B51E /* iterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iterator.cpp; sourceTree = ""; }; + A3561D681414024D00E9B51E /* limits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = limits.cpp; sourceTree = ""; }; + A3561D691414024D00E9B51E /* list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = list.cpp; sourceTree = ""; }; + A3561D6A1414024D00E9B51E /* locale.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locale.cpp; sourceTree = ""; }; + A3561D6B1414024D00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561D6C1414024D00E9B51E /* map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map.cpp; sourceTree = ""; }; + A3561D6D1414024D00E9B51E /* new_handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_handler.cpp; sourceTree = ""; }; + A3561D6E1414024D00E9B51E /* new_op.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_op.cpp; sourceTree = ""; }; + A3561D6F1414024D00E9B51E /* new_opnt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_opnt.cpp; sourceTree = ""; }; + A3561D701414024D00E9B51E /* new_opv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_opv.cpp; sourceTree = ""; }; + A3561D711414024D00E9B51E /* new_opvnt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_opvnt.cpp; sourceTree = ""; }; + A3561D721414024D00E9B51E /* numeric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = numeric.cpp; sourceTree = ""; }; + A3561D731414024D00E9B51E /* ostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ostream.cpp; sourceTree = ""; }; + A3561D741414024D00E9B51E /* queue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = queue.cpp; sourceTree = ""; }; + A3561D751414024D00E9B51E /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; + A3561D761414024D00E9B51E /* set.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = set.cpp; sourceTree = ""; }; + A3561D771414024D00E9B51E /* sstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sstream.cpp; sourceTree = ""; }; + A3561D781414024D00E9B51E /* stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stack.cpp; sourceTree = ""; }; + A3561D791414024D00E9B51E /* stdexcept.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stdexcept.cpp; sourceTree = ""; }; + A3561D7A1414024D00E9B51E /* streambuf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = streambuf.cpp; sourceTree = ""; }; + A3561D7B1414024D00E9B51E /* string.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string.cpp; sourceTree = ""; }; + A3561D7C1414024D00E9B51E /* support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = support.cpp; sourceTree = ""; }; + A3561D7D1414024D00E9B51E /* typeinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = typeinfo.cpp; sourceTree = ""; }; + A3561D7E1414024D00E9B51E /* uClibc++.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "uClibc++.c"; sourceTree = ""; }; + A3561D7F1414024D00E9B51E /* utility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utility.cpp; sourceTree = ""; }; + A3561D801414024D00E9B51E /* valarray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = valarray.cpp; sourceTree = ""; }; + A3561D811414024D00E9B51E /* vector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vector.cpp; sourceTree = ""; }; + A3561DA61414296600E9B51E /* Keylayout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Keylayout.c; sourceTree = ""; }; + A3561DA71414296600E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561DA81414296600E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A35D216F141A73B000969AC0 /* cham-mklayout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "cham-mklayout.c"; sourceTree = ""; }; + A35D2171141A73B000969AC0 /* mac-de.slt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "mac-de.slt"; sourceTree = ""; }; + A35D2172141A73B000969AC0 /* mac-es.slt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "mac-es.slt"; sourceTree = ""; }; + A35D2173141A73B000969AC0 /* mac-fr.slt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "mac-fr.slt"; sourceTree = ""; }; + A35D2174141A73B000969AC0 /* mac-it.slt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "mac-it.slt"; sourceTree = ""; }; + A35D2175141A73B000969AC0 /* mac-se.slt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "mac-se.slt"; sourceTree = ""; }; + A35D2176141A73B000969AC0 /* pc-fr.slt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "pc-fr.slt"; sourceTree = ""; }; + A35D2177141A73B000969AC0 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A35D2178141A753E00969AC0 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; + A35D2187141A75DC00969AC0 /* slimpkg.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = slimpkg.sh; sourceTree = ""; }; + A35D2188141A75DC00969AC0 /* buildpkg.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = buildpkg.sh; sourceTree = ""; }; + A35D2189141A75DC00969AC0 /* builddmg.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = builddmg.sh; sourceTree = ""; }; + A360AA7D14136C1A00084D3F /* Make.rules */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Make.rules; sourceTree = ""; }; + A37D7D4A141B7C6F0069C38B /* background.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = background.tiff; sourceTree = ""; }; + A37D7D4C141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = de; path = de.lproj/Conclusion.rtfd; sourceTree = ""; }; + A37D7D4E141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = de; path = de.lproj/Description.html; sourceTree = ""; }; + A37D7D50141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = de; path = de.lproj/License.rtf; sourceTree = ""; }; + A37D7D52141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; + A37D7D54141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = de; path = de.lproj/Welcome.rtfd; sourceTree = ""; }; + A37D7D55141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = en; path = en.lproj/Conclusion.rtfd; sourceTree = ""; }; + A37D7D56141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = en; path = en.lproj/Description.html; sourceTree = ""; }; + A37D7D57141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/License.rtf; sourceTree = ""; }; + A37D7D58141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; + A37D7D59141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = en; path = en.lproj/Welcome.rtfd; sourceTree = ""; }; + A37D7D5A141B7C6F0069C38B /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = es; path = es.lproj/Conclusion.rtfd; sourceTree = ""; }; + A37D7D5B141B7C6F0069C38B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = es; path = es.lproj/Description.html; sourceTree = ""; }; + A37D7D5C141B7C6F0069C38B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = es; path = es.lproj/License.rtf; sourceTree = ""; }; + A37D7D5D141B7C6F0069C38B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; + A37D7D5E141B7C6F0069C38B /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = es; path = es.lproj/Welcome.rtfd; sourceTree = ""; }; + A37D7D5F141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = fr; path = fr.lproj/Conclusion.rtfd; sourceTree = ""; }; + A37D7D60141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = fr; path = fr.lproj/Description.html; sourceTree = ""; }; + A37D7D61141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = fr; path = fr.lproj/License.rtf; sourceTree = ""; }; + A37D7D62141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; + A37D7D63141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = fr; path = fr.lproj/Welcome.rtfd; sourceTree = ""; }; + A37D7D64141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = "hr-HR"; path = "hr-HR.lproj/Conclusion.rtfd"; sourceTree = ""; }; + A37D7D65141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "hr-HR"; path = "hr-HR.lproj/Description.html"; sourceTree = ""; }; + A37D7D66141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "hr-HR"; path = "hr-HR.lproj/License.rtf"; sourceTree = ""; }; + A37D7D67141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hr-HR"; path = "hr-HR.lproj/Localizable.strings"; sourceTree = ""; }; + A37D7D68141B7C6F0069C38B /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = "hr-HR"; path = "hr-HR.lproj/Welcome.rtfd"; sourceTree = ""; }; + A37D7D69141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = id; path = id.lproj/Conclusion.rtfd; sourceTree = ""; }; + A37D7D6A141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = id; path = id.lproj/Description.html; sourceTree = ""; }; + A37D7D6B141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = id; path = id.lproj/License.rtf; sourceTree = ""; }; + A37D7D6C141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = ""; }; + A37D7D6D141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = id; path = id.lproj/Welcome.rtfd; sourceTree = ""; }; + A37D7D6E141B7C6F0069C38B /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = it; path = it.lproj/Conclusion.rtfd; sourceTree = ""; }; + A37D7D6F141B7C6F0069C38B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = it; path = it.lproj/Description.html; sourceTree = ""; }; + A37D7D70141B7C6F0069C38B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = it; path = it.lproj/License.rtf; sourceTree = ""; }; + A37D7D71141B7C6F0069C38B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; + A37D7D72141B7C6F0069C38B /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = it; path = it.lproj/Welcome.rtfd; sourceTree = ""; }; + A37D7D73141B7C6F0069C38B /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = pl; path = pl.lproj/Conclusion.rtfd; sourceTree = ""; }; + A37D7D74141B7C6F0069C38B /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = pl; path = pl.lproj/Description.html; sourceTree = ""; }; + A37D7D75141B7C6F0069C38B /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = pl; path = pl.lproj/License.rtf; sourceTree = ""; }; + A37D7D76141B7C6F0069C38B /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = ""; }; + A37D7D77141B7C6F0069C38B /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = pl; path = pl.lproj/Welcome.rtfd; sourceTree = ""; }; + A37D7D78141B7C6F0069C38B /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = "pt-BR"; path = "pt-BR.lproj/Conclusion.rtfd"; sourceTree = ""; }; + A37D7D79141B7C6F0069C38B /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "pt-BR"; path = "pt-BR.lproj/Description.html"; sourceTree = ""; }; + A37D7D7A141B7C6F0069C38B /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "pt-BR"; path = "pt-BR.lproj/License.rtf"; sourceTree = ""; }; + A37D7D7B141B7C6F0069C38B /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = ""; }; + A37D7D7C141B7C6F0069C38B /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = "pt-BR"; path = "pt-BR.lproj/Welcome.rtfd"; sourceTree = ""; }; + A37D7D7D141B7C6F0069C38B /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = "pt-PT"; path = "pt-PT.lproj/Conclusion.rtfd"; sourceTree = ""; }; + A37D7D7E141B7C6F0069C38B /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "pt-PT"; path = "pt-PT.lproj/Description.html"; sourceTree = ""; }; + A37D7D7F141B7C6F0069C38B /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "pt-PT"; path = "pt-PT.lproj/License.rtf"; sourceTree = ""; }; + A37D7D80141B7C6F0069C38B /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = ""; }; + A37D7D81141B7C6F0069C38B /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = "pt-PT"; path = "pt-PT.lproj/Welcome.rtfd"; sourceTree = ""; }; + A37D7D82141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = sr; path = sr.lproj/Conclusion.rtfd; sourceTree = ""; }; + A37D7D83141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = sr; path = sr.lproj/Description.html; sourceTree = ""; }; + A37D7D84141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = sr; path = sr.lproj/License.rtf; sourceTree = ""; }; + A37D7D85141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/Localizable.strings; sourceTree = ""; }; + A37D7D86141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = sr; path = sr.lproj/Welcome.rtfd; sourceTree = ""; }; + A3F1F210141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F212141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F214141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F216141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F218141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F21A141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F21C141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F21E141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F220141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F222141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F224141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F226141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F228141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F22A141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F22C141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F22E141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F230141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F233141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F235141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F237141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F239141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F23B141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F23D141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F23F141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F241141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F243141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F245141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F247141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F249141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F24B141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; + A3F1F24D141B9B0D00DDA709 /* postinstall.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall.in; sourceTree = ""; }; + A3F1F24F141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; + A3F1F252141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F254141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F256141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F258141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F25A141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F25C141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F25E141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F260141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F262141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F264141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = postinstall; sourceTree = ""; }; + A3F1F266141B9B0D00DDA709 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; + A3F1F267141B9B3B00DDA709 /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; B0056CE711F3868000754B65 /* boot0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot0.s; sourceTree = ""; }; B0056CE811F3868000754B65 /* chain0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = chain0.s; sourceTree = ""; }; B0056CE911F3868000754B65 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; @@ -780,7 +1124,6 @@ B0056D7411F3868000754B65 /* xml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xml.c; sourceTree = ""; }; B0056D7511F3868000754B65 /* xml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xml.h; sourceTree = ""; }; B0056D7611F3868000754B65 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - B0056D7811F3868000754B65 /* MakePaths.dir */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MakePaths.dir; sourceTree = ""; }; B0056D7A11F3868000754B65 /* machOconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = machOconv.c; sourceTree = ""; }; B0056D7B11F3868000754B65 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; B0056D7C11F3868000754B65 /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = ""; }; @@ -789,40 +1132,7 @@ B0056D8011F3868000754B65 /* coding_standards.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = coding_standards.txt; sourceTree = ""; }; B0056D8111F3868000754B65 /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGES; sourceTree = ""; }; B0056D8211F3868000754B65 /* APPLE_LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = APPLE_LICENSE; sourceTree = ""; }; - B0056D8411F3868000754B65 /* buildpkg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = buildpkg; sourceTree = ""; }; B0056D8511F3868000754B65 /* Distribution */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Distribution; sourceTree = ""; }; - B0056D8611F3868000754B65 /* fdisk */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = fdisk; sourceTree = ""; }; - B0056D8811F3868000754B65 /* AHCIPortInjector.kext */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.kernel-extension"; path = AHCIPortInjector.kext; sourceTree = ""; }; - B0056D8911F3868000754B65 /* ATAPortInjector.kext */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.kernel-extension"; path = ATAPortInjector.kext; sourceTree = ""; }; - B0056D8A11F3868000754B65 /* Disabler.kext */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.kernel-extension"; path = Disabler.kext; sourceTree = ""; }; - B0056D8B11F3868000754B65 /* IOAHCIBlockStorageInjector.kext */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.kernel-extension"; path = IOAHCIBlockStorageInjector.kext; sourceTree = ""; }; - B0056D8C11F3868000754B65 /* JMicronATAInjector.kext */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.kernel-extension"; path = JMicronATAInjector.kext; sourceTree = ""; }; - B0056D8E11F3868000754B65 /* background.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = background.tiff; sourceTree = ""; }; - B0056D9011F3868000754B65 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = English; path = English.lproj/Description.html; sourceTree = ""; }; - B0056D9211F3868000754B65 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/License.rtf; sourceTree = ""; }; - B0056D9411F3868000754B65 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; - B0056D9611F3868000754B65 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = English; path = English.lproj/Welcome.rtfd; sourceTree = ""; }; - B0056D9711F3868000754B65 /* French */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = French; path = French.lproj/Description.html; sourceTree = ""; }; - B0056D9811F3868000754B65 /* French */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = French; path = French.lproj/License.rtf; sourceTree = ""; }; - B0056D9911F3868000754B65 /* French */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/Localizable.strings; sourceTree = ""; }; - B0056D9A11F3868000754B65 /* German */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = German; path = German.lproj/Description.html; sourceTree = ""; }; - B0056D9B11F3868000754B65 /* German */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = German; path = German.lproj/License.rtf; sourceTree = ""; }; - B0056D9C11F3868000754B65 /* German */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/Localizable.strings; sourceTree = ""; }; - B0056D9D11F3868000754B65 /* Spanish */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = Spanish; path = Spanish.lproj/Description.html; sourceTree = ""; }; - B0056D9E11F3868000754B65 /* Spanish */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Spanish; path = Spanish.lproj/License.rtf; sourceTree = ""; }; - B0056D9F11F3868000754B65 /* Spanish */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = Spanish; path = Spanish.lproj/Localizable.strings; sourceTree = ""; }; - B0056DA011F3868000754B65 /* Spanish */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = Spanish; path = Spanish.lproj/Welcome.rtfd; sourceTree = ""; }; - B0056DA311F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - B0056DA511F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - B0056DA811F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - B0056DAA11F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - B0056DAC11F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - B0056DAE11F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - B0056DB011F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - B0056DB211F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - B0056DB411F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - B0056DB611F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; - B0056DB811F3868000754B65 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; B0056DB911F3868000754B65 /* smbios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = smbios.plist; sourceTree = ""; }; B0056DBD11F3868000754B65 /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; B0056DBE11F3868000754B65 /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; @@ -933,6 +1243,7 @@ 019DFBAF11FB94090013E8CC /* MEMTEST86_LICENSE */, B0056D7C11F3868000754B65 /* TODO */, B0056D7D11F3868000754B65 /* Makefile */, + A360AA7D14136C1A00084D3F /* Make.rules */, B0056D8011F3868000754B65 /* coding_standards.txt */, ); name = Chameleon; @@ -2037,6 +2348,777 @@ path = ufs; sourceTree = ""; }; + A3561C721413FD7800E9B51E /* fdisk */ = { + isa = PBXGroup; + children = ( + A3561C731413FD7800E9B51E /* auto.c */, + A3561C741413FD7800E9B51E /* auto.h */, + A3561C751413FD7800E9B51E /* Cconfig */, + A3561C761413FD7800E9B51E /* cmd.c */, + A3561C771413FD7800E9B51E /* cmd.h */, + A3561C781413FD7800E9B51E /* disk.c */, + A3561C791413FD7800E9B51E /* disk.h */, + A3561C7A1413FD7800E9B51E /* fdisk.8 */, + A3561C7B1413FD7800E9B51E /* fdisk.c */, + A3561C7C1413FD7800E9B51E /* getrawpartition.c */, + A3561C7D1413FD7800E9B51E /* Makefile */, + A3561C7E1413FD7800E9B51E /* mbr.c */, + A3561C7F1413FD7800E9B51E /* mbr.h */, + A3561C801413FD7800E9B51E /* mbrcode.h */, + A3561C811413FD7800E9B51E /* misc.c */, + A3561C821413FD7800E9B51E /* misc.h */, + A3561C831413FD7800E9B51E /* opendev.c */, + A3561C841413FD7800E9B51E /* part.c */, + A3561C851413FD7800E9B51E /* part.h */, + A3561C861413FD7800E9B51E /* user.c */, + A3561C871413FD7800E9B51E /* user.h */, + A3561C881413FD7800E9B51E /* util.h */, + ); + path = fdisk; + sourceTree = ""; + }; + A3561CAB1414024C00E9B51E /* modules */ = { + isa = PBXGroup; + children = ( + A3561CAC1414024C00E9B51E /* Cconfig */, + A3561CAD1414024C00E9B51E /* HelloWorld */, + A3561CB21414024C00E9B51E /* include */, + A3561CB41414024C00E9B51E /* Keylayout */, + A3561CB71414024D00E9B51E /* klibc */, + A3561D011414024D00E9B51E /* Makefile */, + A3561D021414024D00E9B51E /* MakeInc.dir */, + A3561D031414024D00E9B51E /* Modules.txt */, + A3561D041414024D00E9B51E /* Resolution */, + A3561D0F1414024D00E9B51E /* uClibcxx */, + ); + path = modules; + sourceTree = ""; + }; + A3561CAD1414024C00E9B51E /* HelloWorld */ = { + isa = PBXGroup; + children = ( + A3561CAE1414024C00E9B51E /* Cconfig */, + A3561CAF1414024C00E9B51E /* HelloWorld.cpp */, + A3561CB01414024C00E9B51E /* include */, + A3561CB11414024C00E9B51E /* Makefile */, + ); + path = HelloWorld; + sourceTree = ""; + }; + A3561CB01414024C00E9B51E /* include */ = { + isa = PBXGroup; + children = ( + ); + path = include; + sourceTree = ""; + }; + A3561CB21414024C00E9B51E /* include */ = { + isa = PBXGroup; + children = ( + A3561CB31414024C00E9B51E /* modules */, + ); + path = include; + sourceTree = ""; + }; + A3561CB41414024C00E9B51E /* Keylayout */ = { + isa = PBXGroup; + children = ( + A3F1F267141B9B3B00DDA709 /* Readme.txt */, + A35D216E141A73B000969AC0 /* layouts */, + A3561DA81414296600E9B51E /* Cconfig */, + A3561DA61414296600E9B51E /* Keylayout.c */, + A3561DA71414296600E9B51E /* Makefile */, + ); + path = Keylayout; + sourceTree = ""; + }; + A3561CB71414024D00E9B51E /* klibc */ = { + isa = PBXGroup; + children = ( + A3561CB81414024D00E9B51E /* __ashldi3.c */, + A3561CB91414024D00E9B51E /* __ashrdi3.c */, + A3561CBA1414024D00E9B51E /* __clzsi2.c */, + A3561CBB1414024D00E9B51E /* __divdi3.c */, + A3561CBC1414024D00E9B51E /* __divsi3.c */, + A3561CBD1414024D00E9B51E /* __lshrdi3.c */, + A3561CBE1414024D00E9B51E /* __moddi3.c */, + A3561CBF1414024D00E9B51E /* __modsi3.c */, + A3561CC01414024D00E9B51E /* __udivdi3.c */, + A3561CC11414024D00E9B51E /* __udivmoddi4.c */, + A3561CC21414024D00E9B51E /* __udivmodsi4.c */, + A3561CC31414024D00E9B51E /* __udivsi3.c */, + A3561CC41414024D00E9B51E /* __umoddi3.c */, + A3561CC51414024D00E9B51E /* __umodsi3.c */, + A3561CC61414024D00E9B51E /* atexit.c */, + A3561CC71414024D00E9B51E /* atexit.h */, + A3561CC81414024D00E9B51E /* atoi.c */, + A3561CC91414024D00E9B51E /* atol.c */, + A3561CCA1414024D00E9B51E /* atoll.c */, + A3561CCB1414024D00E9B51E /* atox.c */, + A3561CCC1414024D00E9B51E /* bsearch.c */, + A3561CCD1414024D00E9B51E /* calloc.c */, + A3561CCE1414024D00E9B51E /* Cconfig */, + A3561CCF1414024D00E9B51E /* exit.c */, + A3561CD01414024D00E9B51E /* jrand48.c */, + A3561CD11414024D00E9B51E /* klibc.c */, + A3561CD21414024D00E9B51E /* LICENSE */, + A3561CD31414024D00E9B51E /* limits.h */, + A3561CD41414024D00E9B51E /* lrand48.c */, + A3561CD51414024D00E9B51E /* Makefile */, + A3561CD61414024D00E9B51E /* memccpy.c */, + A3561CD71414024D00E9B51E /* memchr.c */, + A3561CD81414024D00E9B51E /* memmem.c */, + A3561CD91414024D00E9B51E /* memmove.c */, + A3561CDA1414024D00E9B51E /* memrchr.c */, + A3561CDB1414024D00E9B51E /* memswap.c */, + A3561CDC1414024D00E9B51E /* mrand48.c */, + A3561CDD1414024D00E9B51E /* nrand48.c */, + A3561CDE1414024D00E9B51E /* onexit.c */, + A3561CDF1414024D00E9B51E /* qsort.c */, + A3561CE01414024D00E9B51E /* Readme.txt */, + A3561CE11414024D00E9B51E /* seed48.c */, + A3561CE21414024D00E9B51E /* sha1hash.c */, + A3561CE31414024D00E9B51E /* snprintf.c */, + A3561CE41414024D00E9B51E /* srand48.c */, + A3561CE51414024D00E9B51E /* sscanf.c */, + A3561CE61414024D00E9B51E /* strcasecmp.c */, + A3561CE71414024D00E9B51E /* strdup.c */, + A3561CE81414024D00E9B51E /* strlcat.c */, + A3561CE91414024D00E9B51E /* strncasecmp.c */, + A3561CEA1414024D00E9B51E /* strndup.c */, + A3561CEB1414024D00E9B51E /* strnlen.c */, + A3561CEC1414024D00E9B51E /* strntoimax.c */, + A3561CED1414024D00E9B51E /* strntoumax.c */, + A3561CEE1414024D00E9B51E /* strpbrk.c */, + A3561CEF1414024D00E9B51E /* strsep.c */, + A3561CF01414024D00E9B51E /* strtoimax.c */, + A3561CF11414024D00E9B51E /* strtok.c */, + A3561CF21414024D00E9B51E /* strtok_r.c */, + A3561CF31414024D00E9B51E /* strtol.c */, + A3561CF41414024D00E9B51E /* strtoll.c */, + A3561CF51414024D00E9B51E /* strtotimespec.c */, + A3561CF61414024D00E9B51E /* strtotimeval.c */, + A3561CF71414024D00E9B51E /* strtotimex.c */, + A3561CF81414024D00E9B51E /* strtoul.c */, + A3561CF91414024D00E9B51E /* strtoull.c */, + A3561CFA1414024D00E9B51E /* strtoumax.c */, + A3561CFB1414024D00E9B51E /* strtox.c */, + A3561CFC1414024D00E9B51E /* strxspn.c */, + A3561CFD1414024D00E9B51E /* strxspn.h */, + A3561CFE1414024D00E9B51E /* version */, + A3561CFF1414024D00E9B51E /* vsnprintf.c */, + A3561D001414024D00E9B51E /* vsscanf.c */, + ); + path = klibc; + sourceTree = ""; + }; + A3561D041414024D00E9B51E /* Resolution */ = { + isa = PBXGroup; + children = ( + A3561D051414024D00E9B51E /* 915resolution.c */, + A3561D061414024D00E9B51E /* 915resolution.h */, + A3561D071414024D00E9B51E /* Cconfig */, + A3561D081414024D00E9B51E /* edid.c */, + A3561D091414024D00E9B51E /* include */, + A3561D0B1414024D00E9B51E /* Makefile */, + A3561D0C1414024D00E9B51E /* Readme.txt */, + A3561D0D1414024D00E9B51E /* Resolution.c */, + A3561D0E1414024D00E9B51E /* shortatombios.h */, + ); + path = Resolution; + sourceTree = ""; + }; + A3561D091414024D00E9B51E /* include */ = { + isa = PBXGroup; + children = ( + A3561D0A1414024D00E9B51E /* edid.h */, + ); + path = include; + sourceTree = ""; + }; + A3561D0F1414024D00E9B51E /* uClibcxx */ = { + isa = PBXGroup; + children = ( + A3561D101414024D00E9B51E /* abi.cpp */, + A3561D111414024D00E9B51E /* algorithm.cpp */, + A3561D121414024D00E9B51E /* associative_base.cpp */, + A3561D131414024D00E9B51E /* bitset.cpp */, + A3561D141414024D00E9B51E /* Cconfig */, + A3561D151414024D00E9B51E /* char_traits.cpp */, + A3561D161414024D00E9B51E /* complex.cpp */, + A3561D171414024D00E9B51E /* del_op.cpp */, + A3561D181414024D00E9B51E /* del_opnt.cpp */, + A3561D191414024D00E9B51E /* del_opv.cpp */, + A3561D1A1414024D00E9B51E /* del_opvnt.cpp */, + A3561D1B1414024D00E9B51E /* deque.cpp */, + A3561D1C1414024D00E9B51E /* eh_alloc.cpp */, + A3561D1D1414024D00E9B51E /* eh_globals.cpp */, + A3561D1E1414024D00E9B51E /* exception.cpp */, + A3561D1F1414024D00E9B51E /* fstream.cpp */, + A3561D201414024D00E9B51E /* func_exception.cpp */, + A3561D211414024D00E9B51E /* include */, + A3561D631414024D00E9B51E /* iomanip.cpp */, + A3561D641414024D00E9B51E /* ios.cpp */, + A3561D651414024D00E9B51E /* iostream.cpp */, + A3561D661414024D00E9B51E /* istream.cpp */, + A3561D671414024D00E9B51E /* iterator.cpp */, + A3561D681414024D00E9B51E /* limits.cpp */, + A3561D691414024D00E9B51E /* list.cpp */, + A3561D6A1414024D00E9B51E /* locale.cpp */, + A3561D6B1414024D00E9B51E /* Makefile */, + A3561D6C1414024D00E9B51E /* map.cpp */, + A3561D6D1414024D00E9B51E /* new_handler.cpp */, + A3561D6E1414024D00E9B51E /* new_op.cpp */, + A3561D6F1414024D00E9B51E /* new_opnt.cpp */, + A3561D701414024D00E9B51E /* new_opv.cpp */, + A3561D711414024D00E9B51E /* new_opvnt.cpp */, + A3561D721414024D00E9B51E /* numeric.cpp */, + A3561D731414024D00E9B51E /* ostream.cpp */, + A3561D741414024D00E9B51E /* queue.cpp */, + A3561D751414024D00E9B51E /* Readme.txt */, + A3561D761414024D00E9B51E /* set.cpp */, + A3561D771414024D00E9B51E /* sstream.cpp */, + A3561D781414024D00E9B51E /* stack.cpp */, + A3561D791414024D00E9B51E /* stdexcept.cpp */, + A3561D7A1414024D00E9B51E /* streambuf.cpp */, + A3561D7B1414024D00E9B51E /* string.cpp */, + A3561D7C1414024D00E9B51E /* support.cpp */, + A3561D7D1414024D00E9B51E /* typeinfo.cpp */, + A3561D7E1414024D00E9B51E /* uClibc++.c */, + A3561D7F1414024D00E9B51E /* utility.cpp */, + A3561D801414024D00E9B51E /* valarray.cpp */, + A3561D811414024D00E9B51E /* vector.cpp */, + ); + path = uClibcxx; + sourceTree = ""; + }; + A3561D211414024D00E9B51E /* include */ = { + isa = PBXGroup; + children = ( + A3561D221414024D00E9B51E /* algorithm */, + A3561D231414024D00E9B51E /* associative_base */, + A3561D241414024D00E9B51E /* basic_definitions */, + A3561D251414024D00E9B51E /* bitset */, + A3561D261414024D00E9B51E /* cassert */, + A3561D271414024D00E9B51E /* cctype */, + A3561D281414024D00E9B51E /* cerrno */, + A3561D291414024D00E9B51E /* cfloat */, + A3561D2A1414024D00E9B51E /* char_traits */, + A3561D2B1414024D00E9B51E /* climits */, + A3561D2C1414024D00E9B51E /* clocale */, + A3561D2D1414024D00E9B51E /* cmath */, + A3561D2E1414024D00E9B51E /* complex */, + A3561D2F1414024D00E9B51E /* csetjmp */, + A3561D301414024D00E9B51E /* csignal */, + A3561D311414024D00E9B51E /* cstdarg */, + A3561D321414024D00E9B51E /* cstddef */, + A3561D331414024D00E9B51E /* cstdio */, + A3561D341414024D00E9B51E /* cstdlib */, + A3561D351414024D00E9B51E /* cstring */, + A3561D361414024D00E9B51E /* ctime */, + A3561D371414024D00E9B51E /* cwchar */, + A3561D381414024D00E9B51E /* cwctype */, + A3561D391414024D00E9B51E /* deque */, + A3561D3A1414024D00E9B51E /* exception */, + A3561D3B1414024D00E9B51E /* fstream */, + A3561D3C1414024D00E9B51E /* func_exception */, + A3561D3D1414024D00E9B51E /* functional */, + A3561D3E1414024D00E9B51E /* iomanip */, + A3561D3F1414024D00E9B51E /* ios */, + A3561D401414024D00E9B51E /* iosfwd */, + A3561D411414024D00E9B51E /* iostream */, + A3561D421414024D00E9B51E /* istream */, + A3561D431414024D00E9B51E /* istream_helpers */, + A3561D441414024D00E9B51E /* iterator */, + A3561D451414024D00E9B51E /* iterator_base */, + A3561D461414024D00E9B51E /* limits */, + A3561D471414024D00E9B51E /* list */, + A3561D481414024D00E9B51E /* locale */, + A3561D491414024D00E9B51E /* Makefile */, + A3561D4A1414024D00E9B51E /* map */, + A3561D4B1414024D00E9B51E /* map.old */, + A3561D4C1414024D00E9B51E /* memory */, + A3561D4D1414024D00E9B51E /* new */, + A3561D4E1414024D00E9B51E /* numeric */, + A3561D4F1414024D00E9B51E /* ostream */, + A3561D501414024D00E9B51E /* ostream_helpers */, + A3561D511414024D00E9B51E /* queue */, + A3561D521414024D00E9B51E /* set */, + A3561D531414024D00E9B51E /* set.old */, + A3561D541414024D00E9B51E /* sstream */, + A3561D551414024D00E9B51E /* stack */, + A3561D561414024D00E9B51E /* stdexcept */, + A3561D571414024D00E9B51E /* streambuf */, + A3561D581414024D00E9B51E /* string */, + A3561D591414024D00E9B51E /* string_iostream */, + A3561D5A1414024D00E9B51E /* support */, + A3561D5B1414024D00E9B51E /* system_configuration.h */, + A3561D5C1414024D00E9B51E /* type_traits */, + A3561D5D1414024D00E9B51E /* typeinfo */, + A3561D5E1414024D00E9B51E /* types */, + A3561D5F1414024D00E9B51E /* unwind-cxx.h */, + A3561D601414024D00E9B51E /* utility */, + A3561D611414024D00E9B51E /* valarray */, + A3561D621414024D00E9B51E /* vector */, + ); + path = include; + sourceTree = ""; + }; + A35D216E141A73B000969AC0 /* layouts */ = { + isa = PBXGroup; + children = ( + A35D216F141A73B000969AC0 /* cham-mklayout.c */, + A35D2170141A73B000969AC0 /* layouts-src */, + A35D2177141A73B000969AC0 /* Makefile */, + ); + path = layouts; + sourceTree = ""; + }; + A35D2170141A73B000969AC0 /* layouts-src */ = { + isa = PBXGroup; + children = ( + A35D2178141A753E00969AC0 /* README */, + A35D2171141A73B000969AC0 /* mac-de.slt */, + A35D2172141A73B000969AC0 /* mac-es.slt */, + A35D2173141A73B000969AC0 /* mac-fr.slt */, + A35D2174141A73B000969AC0 /* mac-it.slt */, + A35D2175141A73B000969AC0 /* mac-se.slt */, + A35D2176141A73B000969AC0 /* pc-fr.slt */, + ); + path = "layouts-src"; + sourceTree = ""; + }; + A37D7D49141B7C6F0069C38B /* Resources */ = { + isa = PBXGroup; + children = ( + A37D7D4A141B7C6F0069C38B /* background.tiff */, + A37D7D4B141B7C6F0069C38B /* Conclusion.rtfd */, + A37D7D4D141B7C6F0069C38B /* Description.html */, + A37D7D4F141B7C6F0069C38B /* License.rtf */, + A37D7D51141B7C6F0069C38B /* Localizable.strings */, + A37D7D53141B7C6F0069C38B /* Welcome.rtfd */, + ); + path = Resources; + sourceTree = ""; + }; + A3F1F20D141B9B0D00DDA709 /* Scripts */ = { + isa = PBXGroup; + children = ( + A3F1F20E141B9B0D00DDA709 /* Advanced */, + A3F1F231141B9B0D00DDA709 /* BaseOptions */, + A3F1F24A141B9B0D00DDA709 /* EFI */, + A3F1F24C141B9B0D00DDA709 /* Keymaps */, + A3F1F24E141B9B0D00DDA709 /* Post */, + A3F1F250141B9B0D00DDA709 /* Resolutions */, + A3F1F265141B9B0D00DDA709 /* Standard */, + ); + path = Scripts; + sourceTree = ""; + }; + A3F1F20E141B9B0D00DDA709 /* Advanced */ = { + isa = PBXGroup; + children = ( + A3F1F20F141B9B0D00DDA709 /* BootBanner */, + A3F1F211141B9B0D00DDA709 /* EHCIacquire */, + A3F1F213141B9B0D00DDA709 /* ForceHPET */, + A3F1F215141B9B0D00DDA709 /* ForceWake */, + A3F1F217141B9B0D00DDA709 /* GUI */, + A3F1F219141B9B0D00DDA709 /* LegacyLogo */, + A3F1F21B141B9B0D00DDA709 /* Npci */, + A3F1F21D141B9B0D00DDA709 /* QuietBoot */, + A3F1F21F141B9B0D00DDA709 /* ShowInfo */, + A3F1F221141B9B0D00DDA709 /* SMBIOSdefaults */, + A3F1F223141B9B0D00DDA709 /* UHCIreset */, + A3F1F225141B9B0D00DDA709 /* UseAtiROM */, + A3F1F227141B9B0D00DDA709 /* UseMemDetect */, + A3F1F229141B9B0D00DDA709 /* UseNvidiaROM */, + A3F1F22B141B9B0D00DDA709 /* VBIOS */, + A3F1F22D141B9B0D00DDA709 /* Wait */, + A3F1F22F141B9B0D00DDA709 /* Wake */, + ); + path = Advanced; + sourceTree = ""; + }; + A3F1F20F141B9B0D00DDA709 /* BootBanner */ = { + isa = PBXGroup; + children = ( + A3F1F210141B9B0D00DDA709 /* postinstall */, + ); + path = BootBanner; + sourceTree = ""; + }; + A3F1F211141B9B0D00DDA709 /* EHCIacquire */ = { + isa = PBXGroup; + children = ( + A3F1F212141B9B0D00DDA709 /* postinstall */, + ); + path = EHCIacquire; + sourceTree = ""; + }; + A3F1F213141B9B0D00DDA709 /* ForceHPET */ = { + isa = PBXGroup; + children = ( + A3F1F214141B9B0D00DDA709 /* postinstall */, + ); + path = ForceHPET; + sourceTree = ""; + }; + A3F1F215141B9B0D00DDA709 /* ForceWake */ = { + isa = PBXGroup; + children = ( + A3F1F216141B9B0D00DDA709 /* postinstall */, + ); + path = ForceWake; + sourceTree = ""; + }; + A3F1F217141B9B0D00DDA709 /* GUI */ = { + isa = PBXGroup; + children = ( + A3F1F218141B9B0D00DDA709 /* postinstall */, + ); + path = GUI; + sourceTree = ""; + }; + A3F1F219141B9B0D00DDA709 /* LegacyLogo */ = { + isa = PBXGroup; + children = ( + A3F1F21A141B9B0D00DDA709 /* postinstall */, + ); + path = LegacyLogo; + sourceTree = ""; + }; + A3F1F21B141B9B0D00DDA709 /* Npci */ = { + isa = PBXGroup; + children = ( + A3F1F21C141B9B0D00DDA709 /* postinstall */, + ); + path = Npci; + sourceTree = ""; + }; + A3F1F21D141B9B0D00DDA709 /* QuietBoot */ = { + isa = PBXGroup; + children = ( + A3F1F21E141B9B0D00DDA709 /* postinstall */, + ); + path = QuietBoot; + sourceTree = ""; + }; + A3F1F21F141B9B0D00DDA709 /* ShowInfo */ = { + isa = PBXGroup; + children = ( + A3F1F220141B9B0D00DDA709 /* postinstall */, + ); + path = ShowInfo; + sourceTree = ""; + }; + A3F1F221141B9B0D00DDA709 /* SMBIOSdefaults */ = { + isa = PBXGroup; + children = ( + A3F1F222141B9B0D00DDA709 /* postinstall */, + ); + path = SMBIOSdefaults; + sourceTree = ""; + }; + A3F1F223141B9B0D00DDA709 /* UHCIreset */ = { + isa = PBXGroup; + children = ( + A3F1F224141B9B0D00DDA709 /* postinstall */, + ); + path = UHCIreset; + sourceTree = ""; + }; + A3F1F225141B9B0D00DDA709 /* UseAtiROM */ = { + isa = PBXGroup; + children = ( + A3F1F226141B9B0D00DDA709 /* postinstall */, + ); + path = UseAtiROM; + sourceTree = ""; + }; + A3F1F227141B9B0D00DDA709 /* UseMemDetect */ = { + isa = PBXGroup; + children = ( + A3F1F228141B9B0D00DDA709 /* postinstall */, + ); + path = UseMemDetect; + sourceTree = ""; + }; + A3F1F229141B9B0D00DDA709 /* UseNvidiaROM */ = { + isa = PBXGroup; + children = ( + A3F1F22A141B9B0D00DDA709 /* postinstall */, + ); + path = UseNvidiaROM; + sourceTree = ""; + }; + A3F1F22B141B9B0D00DDA709 /* VBIOS */ = { + isa = PBXGroup; + children = ( + A3F1F22C141B9B0D00DDA709 /* postinstall */, + ); + path = VBIOS; + sourceTree = ""; + }; + A3F1F22D141B9B0D00DDA709 /* Wait */ = { + isa = PBXGroup; + children = ( + A3F1F22E141B9B0D00DDA709 /* postinstall */, + ); + path = Wait; + sourceTree = ""; + }; + A3F1F22F141B9B0D00DDA709 /* Wake */ = { + isa = PBXGroup; + children = ( + A3F1F230141B9B0D00DDA709 /* postinstall */, + ); + path = Wake; + sourceTree = ""; + }; + A3F1F231141B9B0D00DDA709 /* BaseOptions */ = { + isa = PBXGroup; + children = ( + A3F1F232141B9B0D00DDA709 /* arch */, + A3F1F234141B9B0D00DDA709 /* CSTUsingSystemIO */, + A3F1F236141B9B0D00DDA709 /* DropSSDT */, + A3F1F238141B9B0D00DDA709 /* EnableC2State */, + A3F1F23A141B9B0D00DDA709 /* EnableC3State */, + A3F1F23C141B9B0D00DDA709 /* EnableC4State */, + A3F1F23E141B9B0D00DDA709 /* EthernetBuiltIn */, + A3F1F240141B9B0D00DDA709 /* GenerateCStates */, + A3F1F242141B9B0D00DDA709 /* GeneratePStates */, + A3F1F244141B9B0D00DDA709 /* GraphicsEnabler */, + A3F1F246141B9B0D00DDA709 /* InstantMenu */, + A3F1F248141B9B0D00DDA709 /* RestartFix */, + ); + path = BaseOptions; + sourceTree = ""; + }; + A3F1F232141B9B0D00DDA709 /* arch */ = { + isa = PBXGroup; + children = ( + A3F1F233141B9B0D00DDA709 /* postinstall */, + ); + path = arch; + sourceTree = ""; + }; + A3F1F234141B9B0D00DDA709 /* CSTUsingSystemIO */ = { + isa = PBXGroup; + children = ( + A3F1F235141B9B0D00DDA709 /* postinstall */, + ); + path = CSTUsingSystemIO; + sourceTree = ""; + }; + A3F1F236141B9B0D00DDA709 /* DropSSDT */ = { + isa = PBXGroup; + children = ( + A3F1F237141B9B0D00DDA709 /* postinstall */, + ); + path = DropSSDT; + sourceTree = ""; + }; + A3F1F238141B9B0D00DDA709 /* EnableC2State */ = { + isa = PBXGroup; + children = ( + A3F1F239141B9B0D00DDA709 /* postinstall */, + ); + path = EnableC2State; + sourceTree = ""; + }; + A3F1F23A141B9B0D00DDA709 /* EnableC3State */ = { + isa = PBXGroup; + children = ( + A3F1F23B141B9B0D00DDA709 /* postinstall */, + ); + path = EnableC3State; + sourceTree = ""; + }; + A3F1F23C141B9B0D00DDA709 /* EnableC4State */ = { + isa = PBXGroup; + children = ( + A3F1F23D141B9B0D00DDA709 /* postinstall */, + ); + path = EnableC4State; + sourceTree = ""; + }; + A3F1F23E141B9B0D00DDA709 /* EthernetBuiltIn */ = { + isa = PBXGroup; + children = ( + A3F1F23F141B9B0D00DDA709 /* postinstall */, + ); + path = EthernetBuiltIn; + sourceTree = ""; + }; + A3F1F240141B9B0D00DDA709 /* GenerateCStates */ = { + isa = PBXGroup; + children = ( + A3F1F241141B9B0D00DDA709 /* postinstall */, + ); + path = GenerateCStates; + sourceTree = ""; + }; + A3F1F242141B9B0D00DDA709 /* GeneratePStates */ = { + isa = PBXGroup; + children = ( + A3F1F243141B9B0D00DDA709 /* postinstall */, + ); + path = GeneratePStates; + sourceTree = ""; + }; + A3F1F244141B9B0D00DDA709 /* GraphicsEnabler */ = { + isa = PBXGroup; + children = ( + A3F1F245141B9B0D00DDA709 /* postinstall */, + ); + path = GraphicsEnabler; + sourceTree = ""; + }; + A3F1F246141B9B0D00DDA709 /* InstantMenu */ = { + isa = PBXGroup; + children = ( + A3F1F247141B9B0D00DDA709 /* postinstall */, + ); + path = InstantMenu; + sourceTree = ""; + }; + A3F1F248141B9B0D00DDA709 /* RestartFix */ = { + isa = PBXGroup; + children = ( + A3F1F249141B9B0D00DDA709 /* postinstall */, + ); + path = RestartFix; + sourceTree = ""; + }; + A3F1F24A141B9B0D00DDA709 /* EFI */ = { + isa = PBXGroup; + children = ( + A3F1F24B141B9B0D00DDA709 /* postinstall */, + ); + path = EFI; + sourceTree = ""; + }; + A3F1F24C141B9B0D00DDA709 /* Keymaps */ = { + isa = PBXGroup; + children = ( + A3F1F24D141B9B0D00DDA709 /* postinstall.in */, + ); + path = Keymaps; + sourceTree = ""; + }; + A3F1F24E141B9B0D00DDA709 /* Post */ = { + isa = PBXGroup; + children = ( + A3F1F24F141B9B0D00DDA709 /* postinstall */, + ); + path = Post; + sourceTree = ""; + }; + A3F1F250141B9B0D00DDA709 /* Resolutions */ = { + isa = PBXGroup; + children = ( + A3F1F251141B9B0D00DDA709 /* 1024x600x32 */, + A3F1F253141B9B0D00DDA709 /* 1024x768x32 */, + A3F1F255141B9B0D00DDA709 /* 1280x1024x32 */, + A3F1F257141B9B0D00DDA709 /* 1280x800x32 */, + A3F1F259141B9B0D00DDA709 /* 1280x960x32 */, + A3F1F25B141B9B0D00DDA709 /* 1440x900x32 */, + A3F1F25D141B9B0D00DDA709 /* 1600x900x32 */, + A3F1F25F141B9B0D00DDA709 /* 1680x1050x32 */, + A3F1F261141B9B0D00DDA709 /* 1920x1080x32 */, + A3F1F263141B9B0D00DDA709 /* 1920x1200x32 */, + ); + path = Resolutions; + sourceTree = ""; + }; + A3F1F251141B9B0D00DDA709 /* 1024x600x32 */ = { + isa = PBXGroup; + children = ( + A3F1F252141B9B0D00DDA709 /* postinstall */, + ); + path = 1024x600x32; + sourceTree = ""; + }; + A3F1F253141B9B0D00DDA709 /* 1024x768x32 */ = { + isa = PBXGroup; + children = ( + A3F1F254141B9B0D00DDA709 /* postinstall */, + ); + path = 1024x768x32; + sourceTree = ""; + }; + A3F1F255141B9B0D00DDA709 /* 1280x1024x32 */ = { + isa = PBXGroup; + children = ( + A3F1F256141B9B0D00DDA709 /* postinstall */, + ); + path = 1280x1024x32; + sourceTree = ""; + }; + A3F1F257141B9B0D00DDA709 /* 1280x800x32 */ = { + isa = PBXGroup; + children = ( + A3F1F258141B9B0D00DDA709 /* postinstall */, + ); + path = 1280x800x32; + sourceTree = ""; + }; + A3F1F259141B9B0D00DDA709 /* 1280x960x32 */ = { + isa = PBXGroup; + children = ( + A3F1F25A141B9B0D00DDA709 /* postinstall */, + ); + path = 1280x960x32; + sourceTree = ""; + }; + A3F1F25B141B9B0D00DDA709 /* 1440x900x32 */ = { + isa = PBXGroup; + children = ( + A3F1F25C141B9B0D00DDA709 /* postinstall */, + ); + path = 1440x900x32; + sourceTree = ""; + }; + A3F1F25D141B9B0D00DDA709 /* 1600x900x32 */ = { + isa = PBXGroup; + children = ( + A3F1F25E141B9B0D00DDA709 /* postinstall */, + ); + path = 1600x900x32; + sourceTree = ""; + }; + A3F1F25F141B9B0D00DDA709 /* 1680x1050x32 */ = { + isa = PBXGroup; + children = ( + A3F1F260141B9B0D00DDA709 /* postinstall */, + ); + path = 1680x1050x32; + sourceTree = ""; + }; + A3F1F261141B9B0D00DDA709 /* 1920x1080x32 */ = { + isa = PBXGroup; + children = ( + A3F1F262141B9B0D00DDA709 /* postinstall */, + ); + path = 1920x1080x32; + sourceTree = ""; + }; + A3F1F263141B9B0D00DDA709 /* 1920x1200x32 */ = { + isa = PBXGroup; + children = ( + A3F1F264141B9B0D00DDA709 /* postinstall */, + ); + path = 1920x1200x32; + sourceTree = ""; + }; + A3F1F265141B9B0D00DDA709 /* Standard */ = { + isa = PBXGroup; + children = ( + A3F1F266141B9B0D00DDA709 /* postinstall */, + ); + path = Standard; + sourceTree = ""; + }; B0056CE511F3868000754B65 /* i386 */ = { isa = PBXGroup; children = ( @@ -2048,9 +3130,9 @@ B0056D1311F3868000754B65 /* doc */, B0056D1611F3868000754B65 /* libsa */, B0056D2411F3868000754B65 /* libsaio */, + A3561CAB1414024C00E9B51E /* modules */, B0056D7911F3868000754B65 /* util */, B0056D7611F3868000754B65 /* Makefile */, - B0056D7811F3868000754B65 /* MakePaths.dir */, ); path = i386; sourceTree = ""; @@ -2252,6 +3334,10 @@ B0056D7911F3868000754B65 /* util */ = { isa = PBXGroup; children = ( + A3561C721413FD7800E9B51E /* fdisk */, + A3561C891413FD7800E9B51E /* openUp.c */, + A3561C8A1413FD7800E9B51E /* dyldsymboltool.c */, + A3561C8B1413FD7800E9B51E /* bdmesg.c */, B0056D7A11F3868000754B65 /* machOconv.c */, B0056D7B11F3868000754B65 /* Makefile */, ); @@ -2261,155 +3347,17 @@ B0056D8311F3868000754B65 /* package */ = { isa = PBXGroup; children = ( - B0056D8411F3868000754B65 /* buildpkg */, + A35D2187141A75DC00969AC0 /* slimpkg.sh */, + A35D2188141A75DC00969AC0 /* buildpkg.sh */, + A35D2189141A75DC00969AC0 /* builddmg.sh */, B0056D8511F3868000754B65 /* Distribution */, - B0056D8611F3868000754B65 /* fdisk */, - B0056D8711F3868000754B65 /* Kexts */, - B0056D8D11F3868000754B65 /* Resources */, - B0056DA111F3868000754B65 /* Scripts */, + A37D7D49141B7C6F0069C38B /* Resources */, + A3F1F20D141B9B0D00DDA709 /* Scripts */, B0056DB911F3868000754B65 /* smbios.plist */, ); path = package; sourceTree = ""; }; - B0056D8711F3868000754B65 /* Kexts */ = { - isa = PBXGroup; - children = ( - B0056D8811F3868000754B65 /* AHCIPortInjector.kext */, - B0056D8911F3868000754B65 /* ATAPortInjector.kext */, - B0056D8A11F3868000754B65 /* Disabler.kext */, - B0056D8B11F3868000754B65 /* IOAHCIBlockStorageInjector.kext */, - B0056D8C11F3868000754B65 /* JMicronATAInjector.kext */, - ); - path = Kexts; - sourceTree = ""; - }; - B0056D8D11F3868000754B65 /* Resources */ = { - isa = PBXGroup; - children = ( - B0056D8E11F3868000754B65 /* background.tiff */, - B0056D8F11F3868000754B65 /* Description.html */, - B0056D9111F3868000754B65 /* License.rtf */, - B0056D9311F3868000754B65 /* Localizable.strings */, - B0056D9511F3868000754B65 /* Welcome.rtfd */, - ); - path = Resources; - sourceTree = ""; - }; - B0056DA111F3868000754B65 /* Scripts */ = { - isa = PBXGroup; - children = ( - B0056DA211F3868000754B65 /* FAT */, - B0056DA411F3868000754B65 /* HFS */, - B0056DA611F3868000754B65 /* Options */, - B0056DB511F3868000754B65 /* Post */, - B0056DB711F3868000754B65 /* Standard */, - ); - path = Scripts; - sourceTree = ""; - }; - B0056DA211F3868000754B65 /* FAT */ = { - isa = PBXGroup; - children = ( - B0056DA311F3868000754B65 /* postinstall */, - ); - path = FAT; - sourceTree = ""; - }; - B0056DA411F3868000754B65 /* HFS */ = { - isa = PBXGroup; - children = ( - B0056DA511F3868000754B65 /* postinstall */, - ); - path = HFS; - sourceTree = ""; - }; - B0056DA611F3868000754B65 /* Options */ = { - isa = PBXGroup; - children = ( - B0056DA711F3868000754B65 /* EHCIacquire */, - B0056DA911F3868000754B65 /* EthernetBuiltIn */, - B0056DAB11F3868000754B65 /* ForceHPET */, - B0056DAD11F3868000754B65 /* ForceWake */, - B0056DAF11F3868000754B65 /* GraphicsEnabler */, - B0056DB111F3868000754B65 /* GUI */, - B0056DB311F3868000754B65 /* UHCIreset */, - ); - path = Options; - sourceTree = ""; - }; - B0056DA711F3868000754B65 /* EHCIacquire */ = { - isa = PBXGroup; - children = ( - B0056DA811F3868000754B65 /* postinstall */, - ); - path = EHCIacquire; - sourceTree = ""; - }; - B0056DA911F3868000754B65 /* EthernetBuiltIn */ = { - isa = PBXGroup; - children = ( - B0056DAA11F3868000754B65 /* postinstall */, - ); - path = EthernetBuiltIn; - sourceTree = ""; - }; - B0056DAB11F3868000754B65 /* ForceHPET */ = { - isa = PBXGroup; - children = ( - B0056DAC11F3868000754B65 /* postinstall */, - ); - path = ForceHPET; - sourceTree = ""; - }; - B0056DAD11F3868000754B65 /* ForceWake */ = { - isa = PBXGroup; - children = ( - B0056DAE11F3868000754B65 /* postinstall */, - ); - path = ForceWake; - sourceTree = ""; - }; - B0056DAF11F3868000754B65 /* GraphicsEnabler */ = { - isa = PBXGroup; - children = ( - B0056DB011F3868000754B65 /* postinstall */, - ); - path = GraphicsEnabler; - sourceTree = ""; - }; - B0056DB111F3868000754B65 /* GUI */ = { - isa = PBXGroup; - children = ( - B0056DB211F3868000754B65 /* postinstall */, - ); - path = GUI; - sourceTree = ""; - }; - B0056DB311F3868000754B65 /* UHCIreset */ = { - isa = PBXGroup; - children = ( - B0056DB411F3868000754B65 /* postinstall */, - ); - path = UHCIreset; - sourceTree = ""; - }; - B0056DB511F3868000754B65 /* Post */ = { - isa = PBXGroup; - children = ( - B0056DB611F3868000754B65 /* postinstall */, - ); - path = Post; - sourceTree = ""; - }; - B0056DB711F3868000754B65 /* Standard */ = { - isa = PBXGroup; - children = ( - B0056DB811F3868000754B65 /* postinstall */, - ); - path = Standard; - sourceTree = ""; - }; B0056DBA11F3868000754B65 /* artwork */ = { isa = PBXGroup; children = ( @@ -2610,6 +3558,17 @@ French, German, Spanish, + de, + en, + es, + fr, + "hr-HR", + id, + it, + pl, + "pt-BR", + "pt-PT", + sr, ); mainGroup = 08FB7794FE84155DC02AAC07 /* Chameleon */; projectDirPath = ""; @@ -2621,44 +3580,92 @@ /* End PBXProject section */ /* Begin PBXVariantGroup section */ - B0056D8F11F3868000754B65 /* Description.html */ = { + A37D7D4B141B7C6F0069C38B /* Conclusion.rtfd */ = { isa = PBXVariantGroup; children = ( - B0056D9011F3868000754B65 /* English */, - B0056D9711F3868000754B65 /* French */, - B0056D9A11F3868000754B65 /* German */, - B0056D9D11F3868000754B65 /* Spanish */, + A37D7D55141B7C6F0069C38B /* en */, + A37D7D4C141B7C6F0069C38B /* de */, + A37D7D5A141B7C6F0069C38B /* es */, + A37D7D5F141B7C6F0069C38B /* fr */, + A37D7D64141B7C6F0069C38B /* hr-HR */, + A37D7D69141B7C6F0069C38B /* id */, + A37D7D6E141B7C6F0069C38B /* it */, + A37D7D73141B7C6F0069C38B /* pl */, + A37D7D78141B7C6F0069C38B /* pt-BR */, + A37D7D7D141B7C6F0069C38B /* pt-PT */, + A37D7D82141B7C6F0069C38B /* sr */, ); + name = Conclusion.rtfd; + sourceTree = ""; + }; + A37D7D4D141B7C6F0069C38B /* Description.html */ = { + isa = PBXVariantGroup; + children = ( + A37D7D4E141B7C6F0069C38B /* de */, + A37D7D56141B7C6F0069C38B /* en */, + A37D7D5B141B7C6F0069C38B /* es */, + A37D7D60141B7C6F0069C38B /* fr */, + A37D7D65141B7C6F0069C38B /* hr-HR */, + A37D7D6A141B7C6F0069C38B /* id */, + A37D7D6F141B7C6F0069C38B /* it */, + A37D7D74141B7C6F0069C38B /* pl */, + A37D7D79141B7C6F0069C38B /* pt-BR */, + A37D7D7E141B7C6F0069C38B /* pt-PT */, + A37D7D83141B7C6F0069C38B /* sr */, + ); name = Description.html; sourceTree = ""; }; - B0056D9111F3868000754B65 /* License.rtf */ = { + A37D7D4F141B7C6F0069C38B /* License.rtf */ = { isa = PBXVariantGroup; children = ( - B0056D9211F3868000754B65 /* English */, - B0056D9811F3868000754B65 /* French */, - B0056D9B11F3868000754B65 /* German */, - B0056D9E11F3868000754B65 /* Spanish */, + A37D7D50141B7C6F0069C38B /* de */, + A37D7D57141B7C6F0069C38B /* en */, + A37D7D5C141B7C6F0069C38B /* es */, + A37D7D61141B7C6F0069C38B /* fr */, + A37D7D66141B7C6F0069C38B /* hr-HR */, + A37D7D6B141B7C6F0069C38B /* id */, + A37D7D70141B7C6F0069C38B /* it */, + A37D7D75141B7C6F0069C38B /* pl */, + A37D7D7A141B7C6F0069C38B /* pt-BR */, + A37D7D7F141B7C6F0069C38B /* pt-PT */, + A37D7D84141B7C6F0069C38B /* sr */, ); name = License.rtf; sourceTree = ""; }; - B0056D9311F3868000754B65 /* Localizable.strings */ = { + A37D7D51141B7C6F0069C38B /* Localizable.strings */ = { isa = PBXVariantGroup; children = ( - B0056D9411F3868000754B65 /* English */, - B0056D9911F3868000754B65 /* French */, - B0056D9C11F3868000754B65 /* German */, - B0056D9F11F3868000754B65 /* Spanish */, + A37D7D58141B7C6F0069C38B /* en */, + A37D7D52141B7C6F0069C38B /* de */, + A37D7D5D141B7C6F0069C38B /* es */, + A37D7D62141B7C6F0069C38B /* fr */, + A37D7D67141B7C6F0069C38B /* hr-HR */, + A37D7D6C141B7C6F0069C38B /* id */, + A37D7D71141B7C6F0069C38B /* it */, + A37D7D76141B7C6F0069C38B /* pl */, + A37D7D7B141B7C6F0069C38B /* pt-BR */, + A37D7D80141B7C6F0069C38B /* pt-PT */, + A37D7D85141B7C6F0069C38B /* sr */, ); name = Localizable.strings; sourceTree = ""; }; - B0056D9511F3868000754B65 /* Welcome.rtfd */ = { + A37D7D53141B7C6F0069C38B /* Welcome.rtfd */ = { isa = PBXVariantGroup; children = ( - B0056D9611F3868000754B65 /* English */, - B0056DA011F3868000754B65 /* Spanish */, + A37D7D59141B7C6F0069C38B /* en */, + A37D7D54141B7C6F0069C38B /* de */, + A37D7D5E141B7C6F0069C38B /* es */, + A37D7D63141B7C6F0069C38B /* fr */, + A37D7D68141B7C6F0069C38B /* hr-HR */, + A37D7D6D141B7C6F0069C38B /* id */, + A37D7D72141B7C6F0069C38B /* it */, + A37D7D77141B7C6F0069C38B /* pl */, + A37D7D7C141B7C6F0069C38B /* pt-BR */, + A37D7D81141B7C6F0069C38B /* pt-PT */, + A37D7D86141B7C6F0069C38B /* sr */, ); name = Welcome.rtfd; sourceTree = ""; Property changes on: branches/blackosx/artwork/themes/default/device_befs.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/artwork/themes/default/device_freebsd_o.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/artwork/themes/default/device_openbsd.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/artwork/themes/default/device_freebsd.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/artwork/themes/default/device_befs_o.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/artwork/themes/default/device_openbsd_o.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Index: branches/blackosx/i386/MakePaths.dir =================================================================== --- branches/blackosx/i386/MakePaths.dir (revision 1532) +++ branches/blackosx/i386/MakePaths.dir (revision 1533) @@ -1,9 +0,0 @@ -# -# Default paths for subdirectories. -# - -OBJROOT=../../obj/i386/$(DIR) -SYMROOT=../../sym/i386 -DSTROOT=../../dst/i386 -SRCROOT=/tmp - Index: branches/blackosx/i386/libsaio/term.h =================================================================== --- branches/blackosx/i386/libsaio/term.h (revision 0) +++ branches/blackosx/i386/libsaio/term.h (revision 1533) @@ -0,0 +1,59 @@ +/* + * term.h + * Chameleon + * + * Created by JrCs on 30/08/11. + * Copyright 2011. All rights reserved. + * + */ + +#ifndef __LIBSAIO_TERM_H +#define __LIBSAIO_TERM_H + +#define ASCII_KEY_MASK 0x7f +#define ASCII_KEY(x) ((x & ASCII_KEY_MASK)) + +#define KEY_BKSP 0x0008 +#define KEY_TAB 0x0009 +#define KEY_ENTER 0x000d +#define KEY_ESC 0x001b +#define KEY_PRTSC 0x002a +#define KEY_LEFT 0x4b00 +#define KEY_RIGHT 0x4d00 +#define KEY_UP 0x4800 +#define KEY_DOWN 0x5000 +#define KEY_HOME 0x4700 +#define KEY_END 0x4f00 +#define KEY_CENTER 0x4c00 +#define KEY_INS 0x5200 +#define KEY_DEL 0x5300 +#define KEY_PGUP 0x4900 +#define KEY_PGDN 0x5100 +#define KEY_F1 0x3b00 +#define KEY_F2 0x3c00 +#define KEY_F3 0x3d00 +#define KEY_F4 0x3e00 +#define KEY_F5 0x3f00 +#define KEY_F6 0x4000 +#define KEY_F7 0x4100 +#define KEY_F8 0x4200 +#define KEY_F9 0x4300 +#define KEY_F10 0x4400 +#define KEY_F11 0x5700 +#define KEY_F12 0x5800 + +// Key code for input that shouldn't echoed back +#define KEY_NOECHO 0xff00 + +/* Bitmasks for modifier keys */ +#define STATUS_RSHIFT (1 << 0) +#define STATUS_LSHIFT (1 << 1) +#define STATUS_RCTRL (1 << 2) +#define STATUS_RALT (1 << 3) +#define STATUS_SCROLL (1 << 4) +#define STATUS_NUM (1 << 5) +#define STATUS_CAPS (1 << 6) +#define STATUS_LCTRL (1 << 8) +#define STATUS_LALT (1 << 9) + +#endif /* !__LIBSAIO_TERM_H */ Index: branches/blackosx/i386/libsaio/Makefile =================================================================== --- branches/blackosx/i386/libsaio/Makefile (revision 1532) +++ branches/blackosx/i386/libsaio/Makefile (revision 1533) @@ -1,4 +1,4 @@ -SRCROOT = $(shell pwd)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/libsaio SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -10,7 +10,7 @@ DIR = libsaio include ${SRCROOT}/Make.rules -UTILDIR = ../util +UTILDIR = ../util LIBSADIR = ../libsa BOOT2DIR = ../boot2 @@ -26,7 +26,7 @@ CPPFLAGS := $(CPPFLAGS) -nostdinc++ -INC = -I. -I$(SYMROOT) -I$(LIBSADIR) -I$(BOOT2DIR) -I${SRCROOT}/i386/include +INC = -I. -I$(SRCROOT) -I$(SYMROOT) -I$(LIBSADIR) -I$(BOOT2DIR) -I${SRCROOT}/i386/include SAIO_OBJS = table.o asm.o bios.o biosfn.o \ disk.o sys.o cache.o bootstruct.o \ @@ -41,15 +41,17 @@ device_inject.o nvidia.o ati.o gma.o pci_root.o \ convert.o aml_generator.o console.o +SAIO_OBJS := $(addprefix $(OBJROOT)/, $(SAIO_OBJS)) + LIBS = libsaio.a LIBS := $(addprefix $(SYMROOT)/, $(LIBS)) DIRS_NEEDED = $(OBJROOT) $(SYMROOT) -all: $(DIRS_NEEDED) $(LIBS) +all: $(DIRS_NEEDED) $(CONFIG_HEADERS) $(LIBS) all-recursive -$(LIBS): $(addprefix $(OBJROOT)/, $(SAIO_OBJS)) +$(LIBS): $(SAIO_OBJS) @echo "\t[RM] $@" @rm -f $@ @echo "\t[AR] $(@F)" @@ -57,6 +59,8 @@ @echo "\t[RANLIB] $(@F)" @ranlib $(SYMROOT)/$(@F) +clean-local: + @rm -f $(LIBS) $(SAIO_OBJS) # dependencies -include $(OBJROOT)/Makedep Index: branches/blackosx/i386/libsaio/ati.c =================================================================== --- branches/blackosx/i386/libsaio/ati.c (revision 1532) +++ branches/blackosx/i386/libsaio/ati.c (revision 1533) @@ -498,8 +498,9 @@ { 0x68B8, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, { 0x68C0, 0x1594103C, CHIP_FAMILY_REDWOOD, "AMD Radeon HD 6570M", kNull }, - { 0x68C0, 0x392717AA, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5730", kBaboon }, + { 0x68C0, 0x392717AA, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5730", kNull }, + { 0x68C1, 0x033E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5650", kNull }, { 0x68C8, 0x2306103C, CHIP_FAMILY_REDWOOD, "ATI FirePro V4800 (FireGL)", kNull }, @@ -560,10 +561,12 @@ { 0x6740, 0x1657103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6770M", kNull }, { 0x6741, 0x050E1025, CHIP_FAMILY_TURKS, "AMD Radeon HD 6650M", kNull }, - { 0x6741, 0x05131025, CHIP_FAMILY_TURKS, "AMD Radeon HD 6650M", kNull }, - + { 0x6741, 0x05131025, CHIP_FAMILY_TURKS, "AMD Radeon HD 6650M", kNull }, { 0x6741, 0x1646103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6750M", kNull }, + { 0x6741, 0x9080104D, CHIP_FAMILY_TURKS, "AMD Radeon HD 6630M", kNull }, + { 0x6741, 0x9080104D, CHIP_FAMILY_TURKS, "AMD Radeon HD 6630M", kNull, }, + { 0x6759, 0xE193174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570", kNull }, { 0x6760, 0x1CB21043, CHIP_FAMILY_RV730, "AMD Radeon HD 6470M", kNull }, @@ -656,7 +659,7 @@ { 0x673E, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790 Series", kNull }, { 0x6740, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6700M Series", kNull }, - { 0x6741, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6600M/6700M Series", kNull }, + { 0x6741, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6600/6700M Series", kNull }, { 0x6758, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670 Series", kNull }, { 0x6759, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6500 Series", kNull }, Index: branches/blackosx/i386/libsaio/smbios_getters.c =================================================================== --- branches/blackosx/i386/libsaio/smbios_getters.c (revision 1532) +++ branches/blackosx/i386/libsaio/smbios_getters.c (revision 1533) @@ -21,7 +21,35 @@ bool getProcessorInformationExternalClock(returnType *value) { - value->word = Platform.CPU.FSBFrequency/1000000; + if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) // Intel + { + switch (Platform.CPU.Family) + { + case 0x06: + { + switch (Platform.CPU.Model) + { + // set external clock to 0 for SANDY + // removes FSB info from system profiler as on real mac's. + case CPU_MODEL_SANDY_XEON: + case CPU_MODEL_SANDY: + value->word = 0; + break; + default: + value->word = Platform.CPU.FSBFrequency/1000000; + } + } + break; + + default: + value->word = Platform.CPU.FSBFrequency/1000000; + } + } + else + { + value->word = Platform.CPU.FSBFrequency/1000000; + } + return true; } @@ -33,7 +61,7 @@ bool getSMBOemProcessorBusSpeed(returnType *value) { - if (Platform.CPU.Vendor == 0x756E6547) // Intel + if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) // Intel { switch (Platform.CPU.Family) { @@ -113,7 +141,7 @@ value->word = simpleGetSMBOemProcessorType(); - if (Platform.CPU.Vendor == 0x756E6547) // Intel + if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) // Intel { if (!done) { Index: branches/blackosx/i386/boot0/Makefile =================================================================== --- branches/blackosx/i386/boot0/Makefile (revision 1532) +++ branches/blackosx/i386/boot0/Makefile (revision 1533) @@ -1,4 +1,4 @@ -SRCROOT = $(shell pwd)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/boot0 SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -12,15 +12,15 @@ DIRS_NEEDED = $(SYMROOT) +OBJS = boot0 boot0hfs boot0md chain0 +OBJS := $(addprefix $(SYMROOT)/, $(OBJS)) -OBJECTS = boot0 boot0hfs boot0md chain0 -OBJECTS := $(addprefix $(SYMROOT)/, $(OBJECTS)) +all: $(DIRS_NEEDED) $(OBJS) -all: $(DIRS_NEEDED) $(OBJECTS) - -$(OBJECTS): $(SRCROOT)/autoconf.inc +$(OBJS): $(SRCROOT)/autoconf.inc @echo "\t[NASM] $(@F)" @$(NASM) $(@F).s -o $@ -#dependencies - +clean-local: + @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @rm -f $(OBJS) Index: branches/blackosx/i386/boot1/Makefile =================================================================== --- branches/blackosx/i386/boot1/Makefile (revision 1532) +++ branches/blackosx/i386/boot1/Makefile (revision 1533) @@ -1,4 +1,4 @@ -SRCROOT = $(shell pwd)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/boot1 SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -16,8 +16,6 @@ VERS = `vers_string -f 5.0 | tr - .` NEW_VERS = Darwin boot1h v$(VERS) - - PROGRAMS = boot1hp boot1f32 ifeq (${CONFIG_BOOT1_HFS}, y) @@ -41,3 +39,7 @@ install_i386:: all $(INSTALLDIR) cp $(SYMROOT)/boot1h $(INSTALLDIR)/ cd $(INSTALLDIR); chmod u+w $(VERSIONED_FILES) + +clean-local: + @for p in $(PROGRAMS); do if [ -f "$${p}" ];then echo "\t[RM] $${p}"; fi; done + @rm -f $(PROGRAMS) Index: branches/blackosx/i386/boot2/Makefile =================================================================== --- branches/blackosx/i386/boot2/Makefile (revision 1532) +++ branches/blackosx/i386/boot2/Makefile (revision 1533) @@ -1,4 +1,4 @@ -SRCROOT = $(shell pwd)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/boot2 SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -33,7 +33,7 @@ LIBSAIODIR = ../libsaio THEME = $(CONFIG_EMBEDED_THEME) THEMEDIR = ../../artwork/themes/$(THEME) -INC = -I. -I$(SYMDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I${SRCROOT}/i386/include +INC = -I. -I$(SRCROOT) -I$(SYMDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I${SRCROOT}/i386/include LIBS= -L$(SYMDIR) -lsaio -lsa LIBDEP= libsaio.a libsa.a @@ -45,7 +45,8 @@ OBJS = boot2.o boot.o graphics.o drivers.o prompt.o options.o lzss.o mboot.o \ ramdisk.o picopng.o resume.o bmdecompress.o graphic_utils.o gui.o modules.o \ modules_support.o boot_modules.o -# button.o browser.o scrollbar.o == NOTYET +# button.o browser.o scrollbar.o == NOTYET +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) UTILDIR = ../util DIRS_NEEDED = $(OBJROOT) $(SYMROOT) @@ -64,15 +65,15 @@ PATCH_ADDR = $(shell echo ${SYMBOL_ADDR}-${DATA_ADDR}+${DATA_OFFSET} | bc) -all: $(DIRS_NEEDED) boot +all: $(DIRS_NEEDED) boot all-recursive ifeq (${CONFIG_EMBED_THEME}, y) -boot: $(SYMROOT)/art.h $(SYMROOT)/vers.h $(SYMROOT)/embedded.h $(addprefix $(OBJROOT)/, $(OBJS)) $(addprefix $(SYMROOT)/, $(LIBDEP)) +boot: $(CONFIG_HEADERS) $(SYMROOT)/art.h $(SYMROOT)/embedded.h $(OBJS) $(addprefix $(SYMROOT)/, $(LIBDEP)) else -boot: $(SYMROOT)/vers.h $(SYMROOT)/embedded.h $(addprefix $(OBJROOT)/, $(OBJS)) $(addprefix $(SYMROOT)/, $(LIBDEP)) +boot: $(CONFIG_HEADERS) $(SYMROOT)/embedded.h $(OBJS) $(addprefix $(SYMROOT)/, $(LIBDEP)) endif @@ -183,7 +184,12 @@ @cd $(SYMROOT)/../../doc && xxd -i BootHelp.txt > $(SYMROOT)/embedded.h -.PHONY: $(SYMROOT)/vers.h - #dependencies -include $(OBJROOT)/Makedep + +clean-local: + @for o in $(SYMROOT)/boot $(SYMROOT)/boot.sys $(SYMROOT)/embedded.h $(OBJROOT)/Symbols_LINKER_ONLY.dylib; do \ + if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @if [ -d "$(OBJROOT)" ];then echo "\t[RM] all objects in $(OBJROOT)"; fi + @rm -f $(SYMROOT)/boot $(SYMROOT)/boot.sys $(SYMROOT)/embedded.h $(OBJS) + @rm -rf $(OBJROOT) Index: branches/blackosx/i386/boot2/gui.c =================================================================== --- branches/blackosx/i386/boot2/gui.c (revision 1532) +++ branches/blackosx/i386/boot2/gui.c (revision 1533) @@ -9,6 +9,7 @@ */ #include "gui.h" +#include "term.h" #include "appleboot.h" #include "vers.h" @@ -831,8 +832,8 @@ void drawDeviceList (int start, int end, int selection) { int i; - bool shoWinfo = true; //Azi:showinfo - extern bool showBootBanner; // + bool shoWinfo = false; + extern bool showBootBanner; position_t p, p_prev, p_next; //uint8_t maxDevices = MIN( gui.maxdevices, menucount ); @@ -892,9 +893,8 @@ getBoolForKey(kShowInfoKey, &shoWinfo, &bootInfo->chameleonConfig); - if (shoWinfo && showBootBanner) // no boot banner, no showinfo. + if (shoWinfo && showBootBanner) { - // keep formatted with spaces instead of tabs gui.debug.cursor = pos( 10, 100); dprintf( &gui.screen, "label: %s\n", param->label ); dprintf( &gui.screen, "biosdev: 0x%x\n", param->biosdev ); @@ -907,6 +907,7 @@ dprintf( &gui.screen, "name: %s\n", param->name ); dprintf( &gui.screen, "type_name: %s\n", param->type_name ); dprintf( &gui.screen, "modtime: %d\n", param->modTime ); +// // res dprintf( &gui.screen, "width: %d\n", gui.screen.width ); dprintf( &gui.screen, "height: %d\n", gui.screen.height ); // dprintf( &gui.screen, "attr: 0x%x\n", gui.screen.attr ); //Azi: reminder @@ -1604,15 +1605,15 @@ key = getchar(); - if( key == kUpArrowkey ) + if( key == KEY_UP ) if( currentline > 0 ) currentline--; - if( key == kDownArrowkey ) + if( key == KEY_DOWN ) if( lines > ( currentline + visiblelines ) ) currentline++; - if( key == kEscapeKey || key == 'q' || key == 'Q') + if( key == KEY_ESC || key == 'q' || key == 'Q') { gui.infobox.draw = false; gui.redraw = true; @@ -1762,7 +1763,7 @@ switch (key) { - case kUpArrowkey: // up arrow + case KEY_UP: // up arrow if (infoMenuSelection > 0) { if(!infoMenuNativeBoot && infoMenuSelection == INFOMENU_NATIVEBOOT_END + 1) @@ -1784,7 +1785,7 @@ } break; - case kDownArrowkey: // down arrow + case KEY_DOWN: // down arrow if (infoMenuSelection < infoMenuItemsCount - 1) { if(!infoMenuNativeBoot && infoMenuSelection == INFOMENU_NATIVEBOOT_START - 1) @@ -1796,7 +1797,7 @@ } break; - case kReturnKey: + case KEY_ENTER: key = 0; if( infoMenuSelection == MENU_SHOW_MEMORY_INFO ) showInfoBox( "Memory Info. Press q to quit.\n", getMemoryInfoString()); Index: branches/blackosx/i386/boot2/gui.h =================================================================== --- branches/blackosx/i386/boot2/gui.h (revision 1532) +++ branches/blackosx/i386/boot2/gui.h (revision 1533) @@ -38,18 +38,6 @@ VerticalLayout = 1 }; -enum { - kBackspaceKey = 0x08, - kTabKey = 0x09, - kReturnKey = '\r', - kEscapeKey = 0x1b, - kUpArrowkey = 0x4800, - kDownArrowkey = 0x5000, - kASCIIKeyMask = 0x7f, - kF5Key = 0x3f00, - kF10Key = 0x4400 -}; - /* * Menu item structure. */ Index: branches/blackosx/i386/boot2/options.c =================================================================== --- branches/blackosx/i386/boot2/options.c (revision 1532) +++ branches/blackosx/i386/boot2/options.c (revision 1533) @@ -27,6 +27,7 @@ #include "fdisk.h" #include "ramdisk.h" #include "gui.h" +#include "term.h" #include "embedded.h" #include "pci.h" @@ -235,11 +236,11 @@ static void updateBootArgs( int key ) { - key &= kASCIIKeyMask; + key = ASCII_KEY(key); switch ( key ) { - case kBackspaceKey: + case KEY_BKSP: if ( gBootArgsPtr > gBootArgs ) { *--gBootArgsPtr = '\0'; @@ -927,7 +928,7 @@ } switch (key) { - case kReturnKey: + case KEY_ENTER: if (gui.menu.draw) { key=0; break; @@ -978,11 +979,11 @@ gBIOSDev = menuBVR->biosdev; break; - case kEscapeKey: + case KEY_ESC: clearBootArgs(); break; - case kF5Key: + case KEY_F5: // New behavior: // Clear gBootVolume to restart the loop // if the user enabled rescanning the optical drive. @@ -993,14 +994,14 @@ } break; - case kF10Key: + case KEY_F10: gScanSingleDrive = false; scanDisks(gBIOSDev, &bvCount); gBootVolume = NULL; clearBootArgs(); break; - case kTabKey: + case KEY_TAB: // New behavior: // Switch between text & graphic interfaces // Only Permitted if started in graphics interface @@ -1460,8 +1461,8 @@ printf("Enter two-digit hexadecimal boot device [%02x]: ", bootdevice); do { key = getchar(); - switch (key & kASCIIKeyMask) { - case kBackspaceKey: + switch (ASCII_KEY(key)) { + case KEY_BKSP: if (digitsI > 0) { int x, y, t; getCursorPositionAndType(&x, &y, &t); @@ -1476,7 +1477,7 @@ } break; - case kReturnKey: + case KEY_ENTER: digits[digitsI] = '\0'; newbootdevice = strtol(digits, &end, 16); if (end == digits && *end == '\0') { @@ -1494,9 +1495,9 @@ break; default: - if (isxdigit(key & kASCIIKeyMask) && digitsI < 2) { - putchar(key & kASCIIKeyMask); - digits[digitsI++] = key & kASCIIKeyMask; + if (isxdigit(ASCII_KEY(key)) && digitsI < 2) { + putchar(ASCII_KEY(key)); + digits[digitsI++] = ASCII_KEY(key); } else { // TODO: Beep or something } @@ -1510,7 +1511,7 @@ bool promptForRescanOption(void) { printf("\nWould you like to enable media rescan option?\nPress ENTER to enable or any key to skip.\n"); - if (getchar() == kReturnKey) { + if (getchar() == KEY_ENTER) { return true; } else { return false; Index: branches/blackosx/i386/config/cconfig.c =================================================================== --- branches/blackosx/i386/config/cconfig.c (revision 1532) +++ branches/blackosx/i386/config/cconfig.c (revision 1533) @@ -797,7 +797,7 @@ int main(int ac, char **av) { - int saved_x, saved_y; + int saved_x = 0, saved_y = 0; char *mode; int res; int rebuild = 0; Index: branches/blackosx/i386/config/Makefile =================================================================== --- branches/blackosx/i386/config/Makefile (revision 1532) +++ branches/blackosx/i386/config/Makefile (revision 1533) @@ -3,7 +3,7 @@ # we'll just keep the generated files in this directory # and install them directly, rather than generating them again. # -SRCROOT = $(shell pwd)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/config SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -15,10 +15,12 @@ DIR = util include ${SRCROOT}/Make.rules -OBJECTS = cconfig.o32 cconfig.o64 zconf.tab.o32 zconf.tab.o64 \ +OBJS = cconfig.o32 cconfig.o64 zconf.tab.o32 zconf.tab.o64 \ yesno.o32 yesno.o64 textbox.o32 textbox.o64 menubox.o32 \ menubox.o64 checklist.o32 checklist.o64 inputbox.o32 inputbox.o64 +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) + DEFINES = -DKBUILD_NO_NLS -DCURSES_LOC=\ -DPATH_MAX=256 -DPACKAGE=\"chameleon\" LDFLAGS = -lncurses -lmenu @@ -30,7 +32,7 @@ all: $(DIRS_NEEDED) $(SYMPROG) -$(SYMPROG): $(addprefix $(OBJROOT)/, $(OBJECTS)) +$(SYMPROG): $(OBJS) @echo "\t[LD32] $(@F)_32" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/*.o32 @echo "\t[LD64] $(@F)_64" @@ -46,7 +48,10 @@ @cd ${SRCROOT} && $(SYMPROG) $(SRCROOT)/Cconfig rebuild -.PHONY: config +.PHONY: config rebuild_config #dependencies --include $(OBJROOT)/Makedep \ No newline at end of file +-include $(OBJROOT)/Makedep + +distclean-local: + @rm -f $(SYMPROG) $(OBJS) $(OBJROOT)/Makedep Index: branches/blackosx/i386/modules/MakeInc.dir =================================================================== --- branches/blackosx/i386/modules/MakeInc.dir (revision 1532) +++ branches/blackosx/i386/modules/MakeInc.dir (revision 1533) @@ -1,13 +1,12 @@ -SRCROOT = $(shell pwd)/../../../ +SRCROOT = $(abspath $(CURDIR)/../../..) OBJROOT = $(SRCROOT)/obj/i386/modules/$(DIR) -SYMROOT = $(SRCROOT)/sym/i386/modules/ +SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 DOCROOT = $(SRCROOT)/doc IMGROOT = $(SRCROOT)/sym/cache IMGSKELROOT = $(SRCROOT)/imgskel CDBOOT = ${IMGROOT}/usr/standalone/i386/cdboot - ifeq ($(BUILT_IN),yes) override OBJROOT = $(SRCROOT)/obj/i386/boot2_modules/$(DIR) override SYMROOT = $(SRCROOT)/obj/i386/ @@ -22,7 +21,7 @@ -fno-builtin -DSAIO_INTERNAL_USER -static $(OMIT_FRAME_POINTER_CFLAG) \ -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \ -march=pentium4 -msse2 -mfpmath=sse -msoft-float -nostdinc -include $(SRCROOT)/autoconf.h - + CPPFLAGS := $(CPPFLAGS) -arch i386 -static -nostdinc++ -Wmost -Werror \ -fno-builtin -mpreferred-stack-boundary=2 \ -fno-align-functions -fno-stack-protector \ @@ -36,7 +35,7 @@ -fno-align-functions -fno-stack-protector \ -march=pentium4 -msse2 -mfpmath=sse -msoft-float \ -arch i386 -include $(SRCROOT)/autoconf.h - + CPPFLAGS := $(CPPFLAGS) -nostdinc++ -Wmost -Werror \ -fno-builtin -mpreferred-stack-boundary=2 \ -fno-align-functions -fno-stack-protector \ @@ -71,12 +70,11 @@ ifneq ($(BUILT_IN),yes) # Make this as a *MODULE* -all: dylib - @for d in $(SUBDIRS); do (cd $$d; $(MAKE) $@ ); done +all: $(CONFIG_HEADERS) $(HEADER_VERSION) dylib all-recursive else # Module not selected to be compiled as a module -all: +all: $(CONFIG_HEADERS) $(HEADER_VERSION) all-recursive endif @@ -86,12 +84,11 @@ ifeq ($(BUILT_IN),yes) # Make this *BUILT IN* -all: dylib_LINKER - @for d in $(SUBDIRS); do (cd $$d; $(MAKE) $@ ); done +all: $(CONFIG_HEADERS) $(HEADER_VERSION) dylib_LINKER all-recursive else # Module not selected to be built in -all: +all: $(CONFIG_HEADERS) $(HEADER_VERSION) all-recursive endif else @@ -107,10 +104,11 @@ dylib: ${SYMROOT}/modules/ ${OBJROOT} $(SYMROOT)/modules/$(MODULE_NAME).dylib +MODULE_OBJS := $(addprefix $(OBJROOT)/, ${MODULE_OBJS}) ifeq ($(BUILT_IN),yes) -$(SYMROOT)/modules/$(MODULE_NAME).dylib: $(addprefix $(OBJROOT)/, ${MODULE_OBJS}) $(MODULE_DEPENDENCIES) $(OBJROOT)/$(MODULE_NAME).desc $(OBJROOT)/$(MODULE_NAME).author Makefile +$(SYMROOT)/modules/$(MODULE_NAME).dylib: $(MODULE_OBJS) $(MODULE_DEPENDENCIES) $(OBJROOT)/$(MODULE_NAME).desc $(OBJROOT)/$(MODULE_NAME).author Makefile @echo "\t[LD] $(MODULE_NAME).dylib" @ld -arch i386 -undefined dynamic_lookup \ -dylib -read_only_relocs suppress \ @@ -126,9 +124,9 @@ else -$(SYMROOT)/modules/$(MODULE_NAME).dylib: $(addprefix $(OBJROOT)/, ${MODULE_OBJS}) $(MODULE_DEPENDENCIES) $(OBJROOT)/$(MODULE_NAME).desc $(OBJROOT)/$(MODULE_NAME).author $(SRCROOT)/obj/i386/boot2/Symbols_LINKER_ONLY.dylib Makefile +$(SYMROOT)/modules/$(MODULE_NAME).dylib: $(MODULE_OBJS) $(MODULE_DEPENDENCIES) $(OBJROOT)/$(MODULE_NAME).desc $(OBJROOT)/$(MODULE_NAME).author $(SRCROOT)/obj/i386/boot2/Symbols_LINKER_ONLY.dylib Makefile @echo "\t[LD] $(MODULE_NAME).dylib" - + @ld -arch i386 \ -alias _$(MODULE_START) start \ -dylib -read_only_relocs suppress \ @@ -143,41 +141,37 @@ -sectcreate __INFO __description $(OBJROOT)/$(MODULE_NAME).desc \ -macosx_version_min 10.6 \ -o $@ - + endif -clean: - @for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@ ); done - @echo "\t[RM] $(SYMROOT)/modules/$(MODULE_NAME).dylib" - @echo "\t[RM] $(OBJROOT)" - @echo "\t[RM] $(DSTROOT)" - @echo "\t[RM] $(SRCROOT)/revision" - @echo "\t[RM] $(SRCROOT)/i386/modules/module_includes" - @rm -rf $(SYMROOT)/modules/$(MODULE_NAME).dylib &> /dev/null - @rm -rf $(OBJROOT) $(DSTROOT) $(SRCROOT)/revision $(SRCROOT)/i386/modules/module_includes +clean-local: + @if [ -f "$(SYMROOT)/modules/$(MODULE_NAME).dylib" ];then \ + echo "\t[RM] $(SYMROOT)/modules/$(MODULE_NAME).dylib";\ + fi + @for o in $(MODULE_OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @rm -f $(SYMROOT)/modules/$(MODULE_NAME).dylib + @rm -rf $(OBJROOT) - + ${SYMROOT}/modules/: @echo "\t[MKDIR] $@" @$(MKDIRS) $@ - - .PHONY: $(SRCROOT)/sym/i386/boot_modules.h .PHONY: $(SRCROOT)/sym/i386/boot_modules.c $(SRCROOT)/sym/i386/boot_modules.c: @echo "\tstart_built_in_module(\"$(MODULE_NAME)\", \"$(MODULE_AUTHOR)\", \"$(MODULE_DESCRIPTION)\", 0, 0, &$(MODULE_START));" >> $@ - + $(SRCROOT)/sym/i386/boot_modules.h: @echo "void $(MODULE_START)(); // $(MODULE_NAME)" >> $@ - + $(OBJROOT)/$(MODULE_NAME).author: Makefile @echo "$(MODULE_AUTHOR)" > $@ - + $(OBJROOT)/$(MODULE_NAME).desc: Makefile @echo "$(MODULE_DESCRIPTION)" > $@ #dependencies --include $(OBJROOT)/Makedep \ No newline at end of file +-include $(OBJROOT)/Makedep Index: branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-es.slt =================================================================== --- branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-es.slt (revision 0) +++ branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-es.slt (revision 1533) @@ -0,0 +1,59 @@ +# Keycode Normal Shift Alt Shift+Alt + +# 1rst Row +keycode 0x02 = 1 VoidSymbol +keycode 0x03 = 2 ! +keycode 0x04 = 3 # +keycode 0x05 = 4 $ +keycode 0x06 = 5 % [ +keycode 0x07 = 6 / \ +keycode 0x08 = 7 & | +keycode 0x09 = 8 * +keycode 0x0a = 9 ( +keycode 0x0b = 0 ) +keycode 0x0c = minus underscore minus +keycode 0x0d = = + +keycode 0x0e = Backspace + +# 2nd Row +keycode 0x0f = Tab +keycode 0x10 = q Q +keycode 0x11 = w W +keycode 0x12 = e E +keycode 0x13 = r R +keycode 0x14 = t T +keycode 0x15 = y Y +keycode 0x16 = u U +keycode 0x17 = i I ^ +keycode 0x18 = o O +keycode 0x19 = p P +keycode 0x1a = VoidSymbol VoidSymbol +keycode 0x1b = ` VoidSymbol | + +# 3rd Row +keycode 0x1e = a A +keycode 0x1f = s S +keycode 0x20 = d D +keycode 0x21 = f F +keycode 0x22 = g G @ , +keycode 0x23 = h H +keycode 0x24 = j J +keycode 0x25 = k K +keycode 0x26 = l L +keycode 0x27 = VoidSymbol VoidSymbol ~ +keycode 0x28 = ; : +keycode 0x2b = ' " ] } + +# 4th Row +keycode 0x29 = < > [ { +keycode 0x2c = z Z +keycode 0x2d = x X +keycode 0x2e = c C +keycode 0x2f = v V +keycode 0x30 = b B +shift alt keycode 0x30 = < +keycode 0x31 = n N > > +keycode 0x32 = m M +keycode 0x33 = , VoidSymbol +keycode 0x34 = . ? +keycode 0x35 = VoidSymbol VoidSymbol Index: branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-fr.slt =================================================================== --- branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-fr.slt (revision 0) +++ branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-fr.slt (revision 1533) @@ -0,0 +1,61 @@ +# Keycode Normal Shift Alt Shift+Alt + +# 1ère Ligne +keycode 0x02 = & 1 +keycode 0x03 = VoidSymbol 2 +keycode 0x04 = " 3 +keycode 0x05 = ' 4 +keycode 0x06 = ( 5 { [ +keycode 0x07 = VoidSymbol 6 +keycode 0x08 = VoidSymbol 7 +keycode 0x09 = ! 8 +keycode 0x0a = VoidSymbol 9 +keycode 0x0b = VoidSymbol 0 +keycode 0x0c = ) VoidSymbol } ] +keycode 0x0d = - _ +keycode 0x0e = Backspace + +# 2ème Ligne +keycode 0x0f = Tab +keycode 0x10 = a A +keycode 0x11 = z Z +keycode 0x12 = e E +keycode 0x13 = r R +keycode 0x14 = t T +keycode 0x15 = y Y +keycode 0x16 = u U +keycode 0x17 = i I +keycode 0x18 = o O +keycode 0x19 = p P +keycode 0x1a = ^ VoidSymbol +keycode 0x1b = $ * + +# 3ème Ligne +keycode 0x1e = q Q +keycode 0x1f = s S +keycode 0x20 = d D +keycode 0x21 = f F +keycode 0x22 = g G +keycode 0x23 = h H +keycode 0x24 = j J +keycode 0x25 = k K +keycode 0x26 = l L +shift alt keycode 0x26 = | +keycode 0x27 = m M +keycode 0x28 = VoidSymbol % +keycode 0x2b = ` VoidSymbol @ # + +# 4ème Ligne +keycode 0x29 = < > +keycode 0x2c = w W +keycode 0x2d = x X +keycode 0x2e = c C +keycode 0x2f = v V +keycode 0x30 = b B +keycode 0x31 = n N ~ +keycode 0x32 = , ? +keycode 0x33 = ; . +keycode 0x34 = : / +shift alt keycode 0x34 = \ +keycode 0x35 = = + + Index: branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-se.slt =================================================================== --- branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-se.slt (revision 0) +++ branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-se.slt (revision 1533) @@ -0,0 +1,58 @@ +# Keycode Normal Shift Alt Shift+Alt + +# 1rst Row +keycode 0x02 = 1 ! +keycode 0x03 = 2 " +keycode 0x04 = 3 # +keycode 0x05 = 4 VoidSymbol $ +keycode 0x06 = 5 % +keycode 0x07 = 6 & +keycode 0x08 = 7 / | \ +keycode 0x09 = 8 ( [ { +keycode 0x0a = 9 ) ] } +keycode 0x0b = 0 = +keycode 0x0c = + ? +keycode 0x0d = VoidSymbol ` +keycode 0x0e = Backspace + +# 2nd Row +keycode 0x0f = Tab +keycode 0x10 = q Q +keycode 0x11 = w W +keycode 0x12 = e E +keycode 0x13 = r R +keycode 0x14 = t T +keycode 0x15 = y Y +keycode 0x16 = u U +keycode 0x17 = i I ^ +keycode 0x18 = o O +keycode 0x19 = p P +keycode 0x1a = VoidSymbol VoidSymbol VoidSymbol +keycode 0x1b = VoidSymbol ^ ~ ^ + +# 3rd Row +keycode 0x1e = a A +keycode 0x1f = s S +keycode 0x20 = d D +keycode 0x21 = f F +keycode 0x22 = g G , +keycode 0x23 = h H +keycode 0x24 = j J +keycode 0x25 = k K +keycode 0x26 = l L +keycode 0x27 = VoidSymbol VoidSymbol +keycode 0x28 = VoidSymbol VoidSymbol +keycode 0x2b = ' * @ ' + +# 4th Row +keycode 0x29 = < > [ { +keycode 0x2c = z Z +keycode 0x2d = x X +keycode 0x2e = c C +keycode 0x2f = v V +keycode 0x30 = b B +keycode 0x31 = n N +keycode 0x32 = m M +keycode 0x33 = , ; +keycode 0x34 = . : +keycode 0x35 = minus underscore Index: branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-de.slt =================================================================== --- branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-de.slt (revision 0) +++ branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-de.slt (revision 1533) @@ -0,0 +1,58 @@ +# Keycode Normal Shift Alt Shift+Alt + +# 1rst Row +keycode 0x02 = 1 ! +keycode 0x03 = 2 " +keycode 0x04 = 3 VoidSymbol +keycode 0x05 = 4 $ +keycode 0x06 = 5 % [ +keycode 0x07 = 6 & ] +keycode 0x08 = 7 / | +keycode 0x09 = 8 ( { +keycode 0x0a = 9 ) } +keycode 0x0b = 0 = +keycode 0x0c = VoidSymbol ? +keycode 0x0d = VoidSymbol VoidSymbol +keycode 0x0e = Backspace + +# 2nd Row +keycode 0x0f = Tab +keycode 0x10 = q Q +keycode 0x11 = w W +keycode 0x12 = e E +keycode 0x13 = r R +keycode 0x14 = t T +keycode 0x15 = y Y +keycode 0x16 = u U +keycode 0x17 = i I +keycode 0x18 = o O +keycode 0x19 = p P +keycode 0x1a = VoidSymbol VoidSymbol +keycode 0x1b = + * + +# 3rd Row +keycode 0x1e = a A +keycode 0x1f = s S +keycode 0x20 = d D +keycode 0x21 = f F +keycode 0x22 = g G +keycode 0x23 = h H +keycode 0x24 = j J +keycode 0x25 = k K +keycode 0x26 = l L +keycode 0x27 = VoidSymbol VoidSymbol +keycode 0x28 = VoidSymbol VoidSymbol +keycode 0x2b = # ' + +# 4th Row +keycode 0x29 = < > +keycode 0x2c = y Y +keycode 0x2d = x X +keycode 0x2e = c C +keycode 0x2f = v V +keycode 0x30 = b B +keycode 0x31 = n N +keycode 0x32 = m M +keycode 0x33 = , ; +keycode 0x34 = . : +keycode 0x35 = minus underscore Index: branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/pc-fr.slt =================================================================== --- branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/pc-fr.slt (revision 0) +++ branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/pc-fr.slt (revision 1533) @@ -0,0 +1,58 @@ +# Keycode Normal Shift Alt Shift+Alt + +# 1ère Ligne +keycode 0x29 = < > +keycode 0x02 = & 1 +keycode 0x03 = VoidSymbol 2 ~ +keycode 0x04 = " 3 # +keycode 0x05 = ' 4 { +keycode 0x06 = ( 5 [ +keycode 0x07 = minus 6 | +keycode 0x08 = VoidSymbol 7 ` +keycode 0x09 = underscore 8 \ +keycode 0x0a = VoidSymbol 9 ^ +keycode 0x0b = VoidSymbol 0 @ +keycode 0x0c = ) VoidSymbol ] +keycode 0x0d = = + } +keycode 0x0e = Backspace + +# 2ème Ligne +keycode 0x0f = Tab +keycode 0x10 = a A +keycode 0x11 = z Z +keycode 0x12 = e E +keycode 0x13 = r R +keycode 0x14 = t T +keycode 0x15 = y Y +keycode 0x16 = u U +keycode 0x17 = i I +keycode 0x18 = o O +keycode 0x19 = p P +keycode 0x1a = ^ VoidSymbol +keycode 0x1b = $ VoidSymbol + +# 3ème Ligne +keycode 0x1e = q Q +keycode 0x1f = s S +keycode 0x20 = d D +keycode 0x21 = f F +keycode 0x22 = g G +keycode 0x23 = h H +keycode 0x24 = j J +keycode 0x25 = k K +keycode 0x26 = l L +keycode 0x27 = m M +keycode 0x28 = VoidSymbol % +keycode 0x2b = * VoidSymbol + +# 4ème Ligne +keycode 0x2c = w W +keycode 0x2d = x X +keycode 0x2e = c C +keycode 0x2f = v V +keycode 0x30 = b B +keycode 0x31 = n N +keycode 0x32 = , ? +keycode 0x33 = ; . +keycode 0x34 = : / +keycode 0x35 = ! VoidSymbol Index: branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-it.slt =================================================================== --- branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-it.slt (revision 0) +++ branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/mac-it.slt (revision 1533) @@ -0,0 +1,59 @@ +# Keycode Normal Shift Alt Shift+Alt + +# Prima riga +keycode 0x02 = ampersand one +keycode 0x03 = quotedbl two +keycode 0x04 = apostrophe three grave +keycode 0x05 = parenleft four braceleft bracketleft +keycode 0x06 = VoidSymbol five +keycode 0x07 = VoidSymbol six +keycode 0x08 = parenright seven braceright bracketright +keycode 0x09 = VoidSymbol eight +keycode 0x0a = VoidSymbol nine +keycode 0x0b = VoidSymbol zero +keycode 0x0c = minus underscore +keycode 0x0d = equal plus +keycode 0x0e = Backspace + +# Seconda riga +keycode 0x0f = Tab +keycode 0x10 = q Q +keycode 0x11 = z Z +keycode 0x12 = e E +keycode 0x13 = r R +keycode 0x14 = t T +keycode 0x15 = y Y +keycode 0x16 = u U +keycode 0x17 = i I +keycode 0x18 = o O +keycode 0x19 = p P +keycode 0x1a = VoidSymbol ^ +keycode 0x1b = $ * + +# Terza riga +keycode 0x1e = a A +keycode 0x1f = s S +keycode 0x20 = d D +keycode 0x21 = f F +keycode 0x22 = g G +keycode 0x23 = h H +keycode 0x24 = j J +keycode 0x25 = k K +keycode 0x26 = l L +keycode 0x27 = m M +keycode 0x28 = VoidSymbol % +keycode 0x2b = ` VoidSymbol @ # + +# Quarta riga +keycode 0x29 = < > +keycode 0x2c = w W +keycode 0x2d = x X +keycode 0x2e = c C +keycode 0x2f = v V +keycode 0x30 = b B +keycode 0x31 = n N ~ +keycode 0x32 = , ? +keycode 0x33 = ; . +shift alt keycode 0x33 = % +keycode 0x34 = : / | \ +keycode 0x35 = VoidSymbol ! Index: branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/README =================================================================== --- branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/README (revision 0) +++ branches/blackosx/i386/modules/Keylayout/layouts/layouts-src/README (revision 1533) @@ -0,0 +1,2 @@ +You can create your own keylayout file with the cham-mklayout command with a +source file (*.slt) as input. \ No newline at end of file Index: branches/blackosx/i386/modules/Keylayout/layouts/cham-mklayout.c =================================================================== --- branches/blackosx/i386/modules/Keylayout/layouts/cham-mklayout.c (revision 0) +++ branches/blackosx/i386/modules/Keylayout/layouts/cham-mklayout.c (revision 1533) @@ -0,0 +1,373 @@ +/* + * cham-mklayout.c + * Chameleon + * + * Created by JrCs on 30/08/11. + * Copyright 2011. All rights reserved. + * + */ + +#include +#include +#include +#include +#include +#include "stdint.h" +#include "term.h" +#include "keylayout.h" + +#define PACKAGE_NAME "chameleon" +#define PROGRAM_VERSION "1.0" + +static struct keyboard_layout default_layout = { + .keyboard_map = { + /* 0x00 */ 0, KEY_ESC, '1', '2', '3', '4', '5', '6', + /* 0x08 */ '7', '8', '9', '0', '-', '=', KEY_BKSP, KEY_TAB, + /* 0x10 */ 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', + /* 0x18 */ 'o', 'p', '[', ']', KEY_ENTER, 0, 'a', 's', + /* 0x20 */ 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', + /* 0x28 */ '\'', '`', 0, '\\', 'z', 'x', 'c', 'v', + /* 0x30 */ 'b', 'n', 'm', ',', '.', '/', 0, 0 + }, + .keyboard_map_shift = { + /* 0x00 */ 0, KEY_ESC, '!', '@', '#', '$', '%', '^', + /* 0x08 */ '&', '*', '(', ')', '_', '+', KEY_BKSP, 0, + /* 0x10 */ 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', + /* 0x18 */ 'O', 'P', '{', '}', KEY_ENTER, 0, 'A', 'S', + /* 0x20 */ 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', + /* 0x28 */ '"', '~', 0, '|', 'Z', 'X', 'C', 'V', + /* 0x30 */ 'B', 'N', 'M', '<', '>', '?', 0, 0, + }, + .keyboard_map_alt = { + /* 0x00 */ 0, KEY_NOECHO, 0, 0, 0, 0, 0, 0, + /* 0x08 */ 0, 0, 0, 0, 0, 0, KEY_NOECHO, KEY_NOECHO, + /* 0x10 */ 0, 0, 0, 0, 0, 0, 0, 0, + /* 0x18 */ 0, 0, KEY_NOECHO, KEY_NOECHO, KEY_NOECHO, KEY_NOECHO, 0, 0, + /* 0x20 */ 0, 0, 0, 0, 0, 0, 0, KEY_NOECHO, + /* 0x28 */ KEY_NOECHO, KEY_NOECHO, KEY_NOECHO, KEY_NOECHO, 0, 0, 0, 0, + /* 0x30 */ 0, 0, 0, KEY_NOECHO, KEY_NOECHO, KEY_NOECHO, KEY_NOECHO, KEY_NOECHO, + }, +}; + +const char* program_name; + +static struct option options[] = { + {"input", required_argument, 0, 'i'}, + {"output", required_argument, 0, 'o'}, + {"keysyms", no_argument, 0, 'k'}, + {"help", no_argument, 0, 'h'}, + {"version", no_argument, 0, 'V'}, + {0, 0, 0, 0} +}; + +struct hash +{ + const char *keysym; + int code; +}; + +static struct hash keysym_to_code[] = { + {"BackSpace", KEY_BKSP}, + {"Tab", KEY_TAB}, + {"Linefeed", 0x000a}, + {"Space", 0x0020}, + {"Exclam", 0x0021}, + {"QuoteDbl", 0x0022}, + {"NumberSign", 0x0023}, + {"Dollar", 0x0024}, + {"Percent", 0x0025}, + {"Ampersand", 0x0026}, + {"Apostrophe", 0x0027}, + {"Parenleft", 0x0028}, + {"Parenright", 0x0029}, + {"Asterisk", 0x002a}, + {"Plus", 0x002b}, + {"Comma", 0x002c}, + {"Minus", 0x002d}, + {"Period", 0x002e}, + {"Slash", 0x002f}, + {"Zero", 0x0030}, + {"One", 0x0031}, + {"Two", 0x0032}, + {"Three", 0x0033}, + {"Four", 0x0034}, + {"Five", 0x0035}, + {"Six", 0x0036}, + {"Seven", 0x0037}, + {"Eight", 0x0038}, + {"Nine", 0x0039}, + {"Colon", 0x003a}, + {"SemiColon", 0x003b}, + {"Less", 0x003c}, + {"Equal", 0x003d}, + {"Greater", 0x003e}, + {"Question", 0x003f}, + {"At", 0x0040}, + {"BracketLeft", 0x005b}, + {"Backslash", 0x005c}, + {"BracketRight",0x005d}, + {"AsciiCircum", 0x005e}, + {"Underscore", 0x005f}, + {"Grave", 0x0060}, + {"BraceLeft", 0x007b}, + {"Bar", 0x007c}, + {"BraceRight", 0x007d}, + {"AsciiTilde", 0x007e}, + {"Enter", KEY_ENTER}, + {"Escape", KEY_ESC}, + {"PrintScreen", KEY_PRTSC}, + {"Left", KEY_LEFT}, + {"Right", KEY_RIGHT}, + {"Up", KEY_UP}, + {"Down", KEY_DOWN}, + {"Home", KEY_HOME}, + {"End", KEY_END}, + {"Center", KEY_CENTER}, + {"Insert", KEY_INS}, + {"Delete", KEY_DEL}, + {"PageUp", KEY_PGUP}, + {"PageDown", KEY_PGDN}, + {"F1", KEY_F1}, + {"F2", KEY_F2}, + {"F3", KEY_F3}, + {"F4", KEY_F4}, + {"F5", KEY_F5}, + {"F6", KEY_F6}, + {"F7", KEY_F7}, + {"F8", KEY_F8}, + {"F9", KEY_F9}, + {"F10", KEY_F10}, + {"F11", KEY_F11}, + {"F12", KEY_F12}, + {"VoidSymbol", KEY_NOECHO}, + {NULL, 0} +}; + + +static void usage (int status) { + if (status) + fprintf (stderr, "Try `%s --help' for more information.\n", program_name); + else + printf ("\ +Usage: %s [OPTIONS]\n\ + -i, --input set input filename.\n\ + -o, --output set output filename.\n\ + -k, --keysyms list recognized keysyms.\n\ + -h, --help display this message and exit.\n\ + -V, --version print version information and exit.\n\ +\n", program_name); + + exit (status); +} + +static void list_keysyms (void) { + int i; + for (i = 0; keysym_to_code[i].keysym != NULL; i++) { + printf("0x%04x\t %s\n", keysym_to_code[i].code, keysym_to_code[i].keysym); + } +} + +static int hash_lookup (const char *keysym, unsigned int *code) { + int i; + for (i = 0; keysym_to_code[i].keysym != NULL; i++) { + if (strcasecmp (keysym, keysym_to_code[i].keysym) == 0) { + *code = keysym_to_code[i].code; + return 0; + } + } + return -1; +} + +static int parse_keysym(const char* str, unsigned int *code) { + // Single character + if (strlen(str) == 1) { + *code=(unsigned char)(str[0]); + if (*code > ASCII_KEY_MASK) + return -1; + return 0; + } + + // Hex character code + if (sscanf(str, "0x%x", code)) + return 0; + + // Keysym + if (hash_lookup(str, code) == 0) + return 0; + + return -1; +} + +int parse_scancode(int linenum, char* code, unsigned int* scancode) { + + char* tmp; + errno = 0; // clear errno + + float parse_value = strtof(code, &tmp); + int rest = strlen(code) - ((void*) tmp - (void*)code); + if (rest != 0 || errno != 0) { + printf("Ignoring line %d: invalid scancode `%s'\n", linenum, code); + return -1; + } + + *scancode = parse_value; + + // Only the first scancodes can be translated + if (*scancode >= KEYBOARD_MAP_SIZE) { + printf("Ignoring line %d: invalid scancode 0x%02x. Scancode must be <= 0x%02x.\n", linenum, *scancode, + KEYBOARD_MAP_SIZE); + return -1; + } + return 0; +} + +void assign_keycode(int linenum, unsigned int scancode, const char* arg, uint16_t* map) { + unsigned int value; + if (parse_keysym(arg, &value) == -1) { + printf("Warning line %d (keycode 0x%02x): invalid symbol %s (must be a true ascii character)\n", + linenum, scancode, arg); + value = KEY_NOECHO; // VoidSymbol + } + map[scancode] = value; +} + +struct keyboard_layout* create_keylayout(FILE* in) { + char line[128], code[sizeof(line)]; + char arg1[sizeof(line)], arg2[sizeof(line)], arg3[sizeof(line)], + arg4[sizeof(line)]; + int n, linenum = 0; + unsigned int scancode; + + struct keyboard_layout* new_layout= malloc(sizeof(*new_layout)); + if (!new_layout) + return NULL; + + // Initialize new keybord layout + memcpy(new_layout, &default_layout, sizeof(*new_layout)); + + while(fgets(line, sizeof(line), in)) { + linenum++; + n = sscanf (line, "keycode %s = %s %s %s %s", code, arg1, arg2, arg3, arg4); + if (n > 1) { + if (parse_scancode(linenum, code, &scancode) == -1) + continue; + if (n >= 2) + assign_keycode(linenum, scancode, arg1, + new_layout->keyboard_map); + if (n >= 3) + assign_keycode(linenum, scancode, arg2, + new_layout->keyboard_map_shift); + if (n >= 4) + assign_keycode(linenum, scancode, arg3, + new_layout->keyboard_map_alt); + if (n >= 5) + assign_keycode(linenum, scancode, arg4, + new_layout->keyboard_map_shift_alt); + } else if (sscanf (line, "shift keycode %s = %s", code, arg1) == 2) { + if (parse_scancode(linenum, code, &scancode) == -1) + continue; + assign_keycode(linenum, scancode, arg1, + new_layout->keyboard_map_shift); + } else if (sscanf (line, "alt keycode %s = %s", code, arg1) == 2) { + if (parse_scancode(linenum, code, &scancode) == -1) + continue; + assign_keycode(linenum, scancode, arg1, + new_layout->keyboard_map_alt); + } else if (sscanf (line, "shift alt keycode %s = %s", code, arg1) == 2) { + if (parse_scancode(linenum, code, &scancode) == -1) + continue; + assign_keycode(linenum, scancode, arg1, + new_layout->keyboard_map_shift_alt); + } + } + return new_layout; +} + +void write_layout(struct keyboard_layout* layout, FILE* out) { + // Create the header + uint32_t version = KEYBOARD_LAYOUTS_VERSION; + fwrite(KEYBOARD_LAYOUTS_MAGIC, KEYBOARD_LAYOUTS_MAGIC_SIZE, 1, out); + fwrite(&version, 1, sizeof(version), out); + // Seek to start of layout + fseek(out, KEYBOARD_LAYOUTS_MAP_OFFSET, SEEK_SET); + // Write layout + fwrite(layout, sizeof(*layout), 1, out); +} + +void set_program_name(const char* arg) { + const char* last_slash; + last_slash = strrchr(arg, '/'); + program_name = (last_slash != NULL) ? last_slash + 1 : arg; +} + +int main (int argc, char *argv[]) { + int ch; + char *infile_name = NULL; + char *outfile_name = NULL; + FILE *in, *out; + + set_program_name (argv[0]); + + /* Check for options. */ + while ((ch = getopt_long (argc, argv, "i:o:hkV", options, 0)) != -1) { + switch (ch) { + case 'h': + usage (0); + break; + + case 'k': + list_keysyms(); + exit(0); + break; + + case 'i': + infile_name = optarg; + break; + + case 'o': + outfile_name = optarg; + break; + + case 'V': + printf ("%s v%s (%s)\n", program_name, PROGRAM_VERSION, PACKAGE_NAME); + return 0; + + default: + usage (1); + break; + } + } + + if (infile_name == NULL) { + fprintf(stderr, "You must specify an input file\n"); + usage(1); + } + + if (outfile_name == NULL) { + fprintf(stderr, "You must specify an output file\n"); + usage(1); + } + + in = fopen (infile_name, "r"); + if (!in) { + fprintf(stderr, "Couldn't open input file `%s': %s\n", + infile_name, strerror (errno)); + exit(1); + } + + out = fopen (outfile_name, "wb"); + if (!out) { + fprintf(stderr, "Couldn't open output file `%s': %s\n", + outfile_name, strerror (errno)); + exit(1); + } + + struct keyboard_layout* new_layout = create_keylayout(in); + if (new_layout) + write_layout(new_layout, out); + + fclose(out); + fclose(in); + + return 0; +} Index: branches/blackosx/i386/modules/Keylayout/layouts/Makefile =================================================================== --- branches/blackosx/i386/modules/Keylayout/layouts/Makefile (revision 0) +++ branches/blackosx/i386/modules/Keylayout/layouts/Makefile (revision 1533) @@ -0,0 +1,56 @@ + +SRCROOT = $(abspath $(CURDIR)/../../../..) +OBJROOT = $(SRCROOT)/obj/i386/util +SYMROOT = $(SRCROOT)/sym/i386 +DSTROOT = $(SRCROOT)/dst/i386 +DOCROOT = $(SRCROOT)/doc +KEYMAPSROOT = $(SRCROOT)/Keymaps + +INC = -I$(SRCROOT)/i386/libsaio/ -I. -I.. + +OBJS = cham-mklayout.o32 cham-mklayout.o64 +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) + +MKLAYOUT = cham-mklayout +MKLAYOUT := $(addprefix $(SYMROOT)/, $(MKLAYOUT)) + +PROGRAMS = $(MKLAYOUT) + +LAYOUTS_SRC_DIR = layouts-src +KEYBOARD_LAYOUTS = $(patsubst $(LAYOUTS_SRC_DIR)/%.slt, $(KEYMAPSROOT)/%.lyt, \ + $(wildcard $(LAYOUTS_SRC_DIR)/*.slt)) + +DIRS_NEEDED = $(KEYMAPSROOT) + +include ${SRCROOT}/Make.rules + +all: $(DIRS_NEEDED) $(OBJROOT) $(SYMROOT) keymaps + +$(PROGRAMS): $(OBJS) + @echo "\t[LD32] $(@F)_32" + @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -arch i386 \ + -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32 + @echo "\t[LD64] $(@F)_64" + @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -arch x86_64 \ + -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/$(@F).o64 + @echo "\t[LIPO] $(@F)" + @lipo -create -arch i386 $(SYMROOT)/$(@F)_32 -arch x86_64 $(SYMROOT)/$(@F)_64 \ + -output $(SYMROOT)/$(@F) + @$(RM) $(SYMROOT)/$(@F)_32 $(SYMROOT)/$(@F)_64 + +keymaps: $(KEYBOARD_LAYOUTS) + +$(KEYMAPSROOT)/%.lyt: $(LAYOUTS_SRC_DIR)/%.slt $(MKLAYOUT) + @echo "\t[LAYOUT] Creating keyboard layout: $*" + @$(MKLAYOUT) -i $< -o $@ + +#.PHONY layouts +clean-local: + @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @for p in $(PROGRAMS); do if [ -f "$${p}" ];then echo "\t[RM] $${p}"; fi; done + @for k in $(KEYBOARD_LAYOUTS); do if [ -f "$${k}" ];then echo "\t[RM] $${k}"; fi; done + @$(RM) -f $(PROGRAMS) $(OBJS) + +distclean-local: + @if [ -d "$(KEYMAPSROOT)" ];then echo "\t[RMDIR] $(KEYMAPSROOT)"; fi + @$(RM) -rf $(KEYMAPSROOT) Index: branches/blackosx/i386/modules/Keylayout/Keylayout.c =================================================================== --- branches/blackosx/i386/modules/Keylayout/Keylayout.c (revision 0) +++ branches/blackosx/i386/modules/Keylayout/Keylayout.c (revision 1533) @@ -0,0 +1,131 @@ +/* + * Keymapper.c + * Chameleon + * + * Created by JrCs on 28/08/11. + * Copyright 2011. All rights reserved. + * + */ + +#include "libsaio.h" +#include "term.h" +#include "modules.h" +#include "Keylayout.h" +#include "bootstruct.h" + +#define kKeyboardLayout "KeyboardLayout" + +struct keyboard_layout *current_layout = NULL; + +int getchar_replacement() { + int code = bgetc(); + int status = readKeyboardShiftFlags(); + uint8_t scancode = code >> 8; + + // Special scancode sent when alt + some keys are pressed + if (scancode >= 0x78 && scancode <= 0x83) + scancode -= 0x76; + + if (scancode < KEYBOARD_MAP_SIZE && !(status & (STATUS_LCTRL| STATUS_RCTRL))) { + int key; + if ((status & (STATUS_LALT|STATUS_RALT)) && + (status & (STATUS_LSHIFT|STATUS_RSHIFT|STATUS_CAPS))) { + key=current_layout->keyboard_map_shift_alt[scancode]; + } + else if (status & (STATUS_LSHIFT|STATUS_RSHIFT|STATUS_CAPS)) + key=current_layout->keyboard_map_shift[scancode]; + else if (status & (STATUS_LALT|STATUS_RALT)) + key=current_layout->keyboard_map_alt[scancode]; + else + key=current_layout->keyboard_map[scancode]; + + if (key != 0) // do the mapping + code = key; + } + + if (ASCII_KEY(code) != 0) // if ascii not null return it + code = ASCII_KEY(code); + + //printf("Code: %04x\n",code); + return (code); +} + +static uint32_t load_keyboard_layout_file(const char *filename) { + int fd; + char magic[KEYBOARD_LAYOUTS_MAGIC_SIZE]; + uint32_t version; + + if ((fd = open_bvdev("bt(0,0)", filename, 0)) < 0) { + goto fail; // fail + } + + if (read(fd, magic, sizeof(magic)) != sizeof(magic)) { + printf("Can't find magic in keyboard layout file: %s\n", filename); + goto fail; + } + + if (memcmp (magic, KEYBOARD_LAYOUTS_MAGIC, KEYBOARD_LAYOUTS_MAGIC_SIZE) != 0) { + printf("Invalid magic code in keyboard layout file: %s\n", filename); + goto fail; + } + + if (read(fd, (char*) &version, sizeof(version)) != sizeof(version)) { + printf("Can't get version of keyboard layout file: %s\n", filename); + goto fail; + } + + if (version != KEYBOARD_LAYOUTS_VERSION) { + verbose("Bad version for keyboard layout file %s expected v%d found v%d\n", + filename, KEYBOARD_LAYOUTS_VERSION, version); + goto fail; + } + + if (current_layout) + free(current_layout); + + current_layout = malloc(sizeof(*current_layout)); + if (!current_layout) + goto fail; + + b_lseek(fd, KEYBOARD_LAYOUTS_MAP_OFFSET, 0); + + if (read(fd, (char*) current_layout, sizeof(*current_layout)) != sizeof(*current_layout)) { + printf("Wrong keyboard layout file %s size\n", filename); + goto fail; + } + + close(fd); + + return 1; + + fail: + + if (current_layout) { + free(current_layout); + current_layout = NULL; + } + return 0; +} + +void Keylayout_start() +{ + char layoutPath[512]; + const char *val; + int len; + + if (getValueForKey("KeyLayout", &val, &len, &bootInfo->chameleonConfig)) { + sprintf(layoutPath, "/Extra/Keymaps/%s", val); + // Add the extension if needed + if (len <= 4 || strcmp(val+len-4,".lyt") != 0) + strncat(layoutPath, ".lyt", sizeof(layoutPath)); + + if (!load_keyboard_layout_file(layoutPath)) { + printf("Can't load %s keyboard layout file. Keylayout will not be used !\n", + layoutPath); + sleep(2); + } else if (!replace_function("_getchar", &getchar_replacement)) { + printf("Can't replace function getchar: Keylayout module can't be used !\n"); + sleep(2); + } + } +} Index: branches/blackosx/i386/modules/Keylayout/Cconfig =================================================================== --- branches/blackosx/i386/modules/Keylayout/Cconfig (revision 0) +++ branches/blackosx/i386/modules/Keylayout/Cconfig (revision 1533) @@ -0,0 +1,10 @@ +# +# Chameleon Modules +# + +config KEYLAYOUT_MODULE + tristate "Keylayout Module" + default m + ---help--- + Say Y here if you want to enable the use of this module. + Index: branches/blackosx/i386/modules/Keylayout/Readme.txt =================================================================== --- branches/blackosx/i386/modules/Keylayout/Readme.txt (revision 0) +++ branches/blackosx/i386/modules/Keylayout/Readme.txt (revision 1533) @@ -0,0 +1,3 @@ +Module: Keylayout +Description: This module permits the user to define the keyboard key mappings +Dependencies: none Index: branches/blackosx/i386/modules/Keylayout/Keylayout.h =================================================================== --- branches/blackosx/i386/modules/Keylayout/Keylayout.h (revision 0) +++ branches/blackosx/i386/modules/Keylayout/Keylayout.h (revision 1533) @@ -0,0 +1,29 @@ +/* + * Keylayout.h + * Chameleon + * + * Created by JrCs on 28/8/11. + * Copyright 2011. All rights reserved. + * + */ + + +#ifndef __KEYLAYOUT_H +#define __KEYLAYOUT_H + +#define KEYBOARD_LAYOUTS_MAGIC "CHAMLAYT" +#define KEYBOARD_LAYOUTS_MAGIC_SIZE (sizeof(KEYBOARD_LAYOUTS_MAGIC) - 1) +#define KEYBOARD_LAYOUTS_VERSION 3 +#define KEYBOARD_LAYOUTS_MAP_OFFSET 0x10 // 0x10 offset of the map in layout file + +#define KEYBOARD_MAP_SIZE 0x38 + +struct keyboard_layout +{ + uint16_t keyboard_map[KEYBOARD_MAP_SIZE]; + uint16_t keyboard_map_shift[KEYBOARD_MAP_SIZE]; + uint16_t keyboard_map_alt[KEYBOARD_MAP_SIZE]; + uint16_t keyboard_map_shift_alt[KEYBOARD_MAP_SIZE]; +}; + +#endif Index: branches/blackosx/i386/modules/Keylayout/Makefile =================================================================== --- branches/blackosx/i386/modules/Keylayout/Makefile (revision 0) +++ branches/blackosx/i386/modules/Keylayout/Makefile (revision 1533) @@ -0,0 +1,14 @@ +MODULE_NAME = Keylayout +MODULE_DESCRIPTION = This module provides keylayout functionality +MODULE_AUTHOR = "JrCs" +MODULE_VERSION = "1.2.0" +MODULE_COMPAT_VERSION = "1.2.0" +MODULE_START = $(MODULE_NAME)_start +MODULE_DEPENDENCIES = + +DIR = Keylayout +SUBDIRS += layouts + +MODULE_OBJS = Keylayout.o + +include ../MakeInc.dir Index: branches/blackosx/i386/modules/Cconfig =================================================================== --- branches/blackosx/i386/modules/Cconfig (revision 1532) +++ branches/blackosx/i386/modules/Cconfig (revision 1533) @@ -7,4 +7,5 @@ source "i386/modules/klibc/Cconfig" source "i386/modules/uClibcxx/Cconfig" source "i386/modules/HelloWorld/Cconfig" -endmenu \ No newline at end of file +source "i386/modules/Keylayout/Cconfig" +endmenu Index: branches/blackosx/i386/modules/Makefile =================================================================== --- branches/blackosx/i386/modules/Makefile (revision 1532) +++ branches/blackosx/i386/modules/Makefile (revision 1533) @@ -1,5 +1,5 @@ -# Makefile for i386 modules -SRCROOT = $(shell pwd)/../../ +# Makefile for i386 modules +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/modules/ SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -29,6 +29,10 @@ SUBDIRS += HelloWorld endif +ifdef CONFIG_KEYLAYOUT_MODULE +SUBDIRS += Keylayout +endif + CFLAGS= -O3 $(MORECPP) -arch i386 -g -static DEFINES= CONFIG = hd @@ -37,28 +41,13 @@ ifeq (${CONFIG_MODULES}, y) -all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h - @for i in ${SUBDIRS}; \ - do \ - echo ================= make $@ for $$i =================; \ - ( cd $$i; $(MKDIRS) $(OBJROOT)/$$i; ${MAKE} \ - "OBJROOT=$(OBJROOT)/$$i" \ - "SYMROOT=$(SYMROOT)/" \ - "DSTROOT=$(DSTROOT)/" \ - "SRCROOT=$(SRCROOT)" \ - "RC_ARCHS=$(RC_ARCHS)" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$(RC_CFLAGS)" $@ \ - ) || exit $$?; \ - done - +all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h all-recursive @# Finish up boot_modules.c @echo "}" >> $(SYMROOT)/boot_modules.c else -all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h +all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h all-recursive @# Finish up boot_modules.c @echo "}" >> $(SYMROOT)/boot_modules.c @@ -85,3 +74,6 @@ @echo "// Autogenerated - do not modify" > $@ @echo "void start_built_in_modules(); " > $@ endif + +clean-local: + @rm -f $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h Index: branches/blackosx/i386/cdboot/Makefile =================================================================== --- branches/blackosx/i386/cdboot/Makefile (revision 1532) +++ branches/blackosx/i386/cdboot/Makefile (revision 1533) @@ -1,4 +1,4 @@ -SRCROOT = $(shell pwd)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/cdboot SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -25,4 +25,6 @@ | perl -ane "print pack('V',@F[0]);" \ | dd of=$(SYMROOT)/cdboot bs=1 count=4 seek=2044 conv=notrunc &> /dev/null -#dependencies +clean-local: + @if [ -f "$(SYMROOT)/cdboot" ];then echo "\t[RM] $(SYMROOT)/cdboot"; fi + @rm -f $(SYMROOT)/cdboot Index: branches/blackosx/i386/libsa/Makefile =================================================================== --- branches/blackosx/i386/libsa/Makefile (revision 1532) +++ branches/blackosx/i386/libsa/Makefile (revision 1533) @@ -1,4 +1,4 @@ -SRCROOT = $(shell pwd)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/libsa SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -22,10 +22,12 @@ INC = -I. -I$(SYMROOT) -I$(LIBSAIODIR) -I${SRCROOT}/i386/include -SA_OBJS = prf.o printf.o zalloc.o \ +OBJS = prf.o printf.o zalloc.o \ string.o strtol.o error.o \ setjmp.o qsort.o efi_tables.o +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) + LIBS = libsa.a LIBS := $(addprefix $(SYMROOT)/, $(LIBS)) @@ -34,7 +36,7 @@ all embedtheme: $(DIRS_NEEDED) $(LIBS) -$(LIBS): $(addprefix $(OBJROOT)/, $(SA_OBJS)) +$(LIBS): $(OBJS) @echo "\t[RM] $@" @rm -f $@ @echo "\t[AR] $(@F)" @@ -44,3 +46,8 @@ # dependencies -include $(OBJROOT)/Makedep + +clean-local: + @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @for l in $(LIBS); do if [ -f "$${l}" ];then echo "\t[RM] $${l}"; fi; done + @rm -f $(LIBS) $(OBJS) Index: branches/blackosx/i386/Makefile =================================================================== --- branches/blackosx/i386/Makefile (revision 1532) +++ branches/blackosx/i386/Makefile (revision 1533) @@ -3,7 +3,7 @@ # # these paths are only valid in subdirectories of this directory # -SRCROOT = $(shell pwd)/../ +SRCROOT = $(abspath $(CURDIR)/..) OBJROOT = $(SRCROOT)/obj/i386 SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -16,57 +16,10 @@ # The order of building is important. SUBDIRS_PRE = util -SUBDIRS = libsa libsaio boot0 boot1 boot2 cdboot modules +SUBDIRS = $(SUBDIRS_PRE) libsa libsaio boot0 boot1 boot2 cdboot modules -all: - @for i in ${SUBDIRS_PRE}; \ - do \ - echo ================= make $@ for $$i =================; \ - ( cd $$i; ${MAKE} \ - "OBJROOT=$(OBJROOT)/$$i" \ - "SYMROOT=$(SYMROOT)" \ - "DSTROOT=$(DSTROOT)" \ - "SRCROOT=$(SRCROOT)" \ - "RC_ARCHS=$(RC_ARCHS)" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$(RC_CFLAGS)" $@ \ - ) || exit $$?; \ - done +modules-builtin: + @cd modules; ${MAKE} BUILT_IN=yes - @cd modules; ${MAKE} BUILT_IN=yes $@ +all: $(CONFIG_HEADERS) modules-builtin all-recursive - - @for i in ${SUBDIRS}; \ - do \ - echo ================= make $@ for $$i =================; \ - ( cd $$i; ${MAKE} \ - "OBJROOT=$(OBJROOT)/$$i" \ - "SYMROOT=$(SYMROOT)" \ - "DSTROOT=$(DSTROOT)" \ - "SRCROOT=$(SRCROOT)" \ - "RC_ARCHS=$(RC_ARCHS)" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$(RC_CFLAGS)" $@ \ - ) || exit $$?; \ - done - -config rebuild_config: - @for i in config; \ - do \ - echo ================= make $@ for $$i =================; \ - ( cd $$i; ${MAKE} \ - "OBJROOT=$(OBJROOT)/$$i" \ - "SYMROOT=$(SYMROOT)" \ - "DSTROOT=$(DSTROOT)" \ - "SRCROOT=$(SRCROOT)" \ - "RC_ARCHS=$(RC_ARCHS)" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$(RC_CFLAGS)" $@ \ - ) || exit $$?; \ - done - - -.PHONY: config \ No newline at end of file Index: branches/blackosx/i386/util/fdisk/Cconfig =================================================================== --- branches/blackosx/i386/util/fdisk/Cconfig (revision 1532) +++ branches/blackosx/i386/util/fdisk/Cconfig (revision 1533) @@ -3,5 +3,5 @@ default y help Say Y here if you want to compile the fdisk440 utility. - fdisk440 is used to update the boot0 file on the partition by replacing the first 440 bytes, instead of the first 446 bytes as with frisk. + fdisk440 is used to update the boot0 file on the partition by replacing the first 440 bytes, instead of the first 446 bytes as with fdisk. When in doubt, say "Y". Index: branches/blackosx/i386/util/fdisk/Makefile =================================================================== --- branches/blackosx/i386/util/fdisk/Makefile (revision 1532) +++ branches/blackosx/i386/util/fdisk/Makefile (revision 1533) @@ -1,4 +1,4 @@ -SRCROOT = $(shell pwd)/../../../ +SRCROOT = $(abspath $(CURDIR)/../../..) OBJROOT = $(SRCROOT)/obj/i386/util/fdisk SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -19,16 +19,16 @@ OBJS = cmd.o32 disk.o32 fdisk.o32 getrawpartition.o32 mbr.o32 misc.o32 opendev.o32 part.o32 user.o32 auto.o32 \ cmd.o64 disk.o64 fdisk.o64 getrawpartition.o64 mbr.o64 misc.o64 opendev.o64 part.o64 user.o64 auto.o64 +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) PROGRAM = fdisk440 PROGRAM:= $(addprefix $(SYMROOT)/, $(PROGRAM)) - ifeq ($(CONFIG_FDISK440),y) all: $(SYMROOT) $(OBJROOT) $(PROGRAM) -$(PROGRAM): $(addprefix $(OBJROOT)/, $(OBJS)) +$(PROGRAM): $(OBJS) @echo "\t[LD32] $@_32" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $@_32 $(filter %.o32,$^) @echo "\t[LD64] $@_64" @@ -47,3 +47,7 @@ #dependencies -include $(OBJROOT)/Makedep +clean-local: + @for p in $(PROGRAMS); do if [ -f "$${p}" ];then echo "\t[RM] $${p}"; fi; done + @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @rm -f $(PROGRAM) $(OBJS) Index: branches/blackosx/i386/util/Makefile =================================================================== --- branches/blackosx/i386/util/Makefile (revision 1532) +++ branches/blackosx/i386/util/Makefile (revision 1533) @@ -3,7 +3,7 @@ # we'll just keep the generated files in this directory # and install them directly, rather than generating them again. # -SRCROOT = $(shell pwd)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/util SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -17,19 +17,20 @@ include ${SRCROOT}/Make.rules PROGRAMS = machOconv dyldsymboltool -OBJECTS = dyldsymboltool.o32 dyldsymboltool.o64 machOconv.o32 machOconv.o64 +OBJS = dyldsymboltool.o32 dyldsymboltool.o64 machOconv.o32 machOconv.o64 ifeq (${CONFIG_BDMESG}, y) PROGRAMS += bdmesg -OBJECTS += bdmesg.o32 bdmesg.o64 +OBJS += bdmesg.o32 bdmesg.o64 endif ifeq (${CONFIG_OPENUP}, y) PROGRAMS += openUp -OBJECTS += openUp.o64 openUp.o32 +OBJS += openUp.o64 openUp.o32 endif +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) LDFLAGS := $(LDFALGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.5 @@ -37,9 +38,11 @@ DIRS_NEEDED = $(OBJROOT) $(SYMROOT) -all: $(DIRS_NEEDED) $(SYMPROG) fdisk440 +SUBDIRS = fdisk -$(SYMPROG): $(addprefix $(OBJROOT)/, $(OBJECTS)) +all: $(DIRS_NEEDED) $(SYMPROG) all-recursive + +$(SYMPROG): $(OBJS) @echo "\t[LD32] $(@F)_32" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32 @echo "\t[LD64] $(@F)_64" @@ -48,13 +51,10 @@ @lipo -create -arch i386 $(SYMROOT)/$(@F)_32 -arch x86_64 $(SYMROOT)/$(@F)_64 -output $(SYMROOT)/$(@F) @$(RM) $(SYMROOT)/$(@F)_32 $(SYMROOT)/$(@F)_64 +#dependencies +-include $(OBJROOT)/Makedep - -.PHONY: fdisk440 -fdisk440: - @echo ================= make all for fdisk =================; - @$(MAKE) -C fdisk - - -#dependencies --include $(OBJROOT)/Makedep \ No newline at end of file +clean-local: + @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @for p in $(SYMPROG); do if [ -f "$${p}" ];then echo "\t[RM] $${p}"; fi; done + @rm -f $(SYMPROG) $(OBJS) Index: branches/blackosx/package/slimpkg.sh =================================================================== --- branches/blackosx/package/slimpkg.sh (revision 1532) +++ branches/blackosx/package/slimpkg.sh (revision 1533) @@ -18,11 +18,11 @@ COL_BLUE="\x1b[34;01m" COL_RESET="\x1b[39;49;00m" -#version=$( grep I386BOOT_CHAMELEONVERSION sym/i386/vers.h | awk '{ print $3 }' | tr -d '\"' ) +#version=$( grep I386BOOT_CHAMELEONVERSION vers.h | awk '{ print $3 }' | tr -d '\"' ) version=$( cat version ) stage=${version##*-} -revision=$( grep I386BOOT_CHAMELEONREVISION sym/i386/vers.h | awk '{ print $3 }' | tr -d '\"' ) -builddate=$( grep I386BOOT_BUILDDATE sym/i386/vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) +revision=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' ) +builddate=$( grep I386BOOT_BUILDDATE vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) timestamp=$( date -j -f "%Y-%m-%d %H:%M:%S" "${builddate}" "+%s" ) # ================= Index: branches/blackosx/package/builddmg.sh =================================================================== --- branches/blackosx/package/builddmg.sh (revision 1532) +++ branches/blackosx/package/builddmg.sh (revision 1533) @@ -36,8 +36,8 @@ version=$( cat version ) stage=${version##*-} -revision=$( grep I386BOOT_CHAMELEONREVISION sym/i386/vers.h | awk '{ print $3 }' | tr -d '\"' ) -builddate=$( grep I386BOOT_BUILDDATE sym/i386/vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) +revision=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' ) +builddate=$( grep I386BOOT_BUILDDATE vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) timestamp=$( date -j -f "%Y-%m-%d %H:%M:%S" "${builddate}" "+%s" ) # ========================= Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/MacOS/Chameleon ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/footer.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/gfxutil ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/Linux.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/Chameleon.icns ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/icns Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/CDROM.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/plug.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/French.lproj/Chameleon.nib ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/French.lproj/Chameleon.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/French.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/cham.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/German.lproj/Chameleon.nib ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/German.lproj/Chameleon.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/German.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/syringe.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/chip.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/Italian.lproj/Chameleon.nib ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/Italian.lproj/Chameleon.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/Italian.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/wrench.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/Windows.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/MacOSX.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/English.lproj/InfoPlist.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/English.lproj/Chameleon.nib ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/English.lproj/Chameleon.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/English.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/Chameleon.tiff ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/tiff Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/chamsmall.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/advanced.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/Spanish.lproj/Chameleon.nib ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/Spanish.lproj/Chameleon.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/Spanish.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/flag.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/background.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/name.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Property changes on: branches/blackosx/package/Configuration/PrefPanel/Chameleon.prefPane/Contents/Resources/disk.png ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/png Index: branches/blackosx/package/Scripts/Standard/postinstall =================================================================== --- branches/blackosx/package/Scripts/Standard/postinstall (revision 1532) +++ branches/blackosx/package/Scripts/Standard/postinstall (revision 1533) @@ -231,7 +231,7 @@ echo "*************************************" if [ "$( fstyp ${bootdev} | grep hfs )" ]; then - echo "${bootdev} is a currently formatted as HFS" + echo "${bootdev} is currently formatted as HFS" efiformat="hfs" fi if [ "$( fstyp ${bootdev} | grep msdos )" ]; then @@ -287,7 +287,7 @@ echo "Diskupdate = true, so yes" #--------------------------------------------------------------------- # Check bytes 438-446 of the GPTdiskProtectiveMBR for a Windows Disk Signature - # If thereÕs no Windows disk signature then we can write boot0 + # If there's no Windows disk signature then we can write boot0 #--------------------------------------------------------------------- if [ ${disksignature} == "00000000" ]; then Index: branches/blackosx/package/Scripts/EFI/postinstall =================================================================== --- branches/blackosx/package/Scripts/EFI/postinstall (revision 1532) +++ branches/blackosx/package/Scripts/EFI/postinstall (revision 1533) @@ -268,7 +268,7 @@ fi if [ "$( fstyp ${bootdev} | grep hfs )" ]; then - echo "${bootdev} is a currently formatted as HFS" + echo "${bootdev} is currently formatted as HFS" efiformat="hfs" fi if [ "$( fstyp ${bootdev} | grep msdos )" ]; then @@ -298,51 +298,60 @@ echo "Diskupdate = true, so yes" #--------------------------------------------------------------------- # Check bytes 438-446 of the GPTdiskProtectiveMBR for a Windows Disk Signature - # If thereÕs no Windows disk signature then we can write boot0 + # If there's no Windows disk signature then we can write boot0 #--------------------------------------------------------------------- if [ ${disksignature} == "00000000" ]; then - echo "Executing command: fdisk -u -f ${diskloader} -y ${bootdisk}" - fdisk -u -f "${osxvolume}/${diskloader}" -y ${bootdisk} + echo "Executing command: fdisk -u -f "${osxvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk}" + fdisk -u -f "${osxvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk} else #--------------------------------------------------------------------- # If it exists then Windows is also installed on the HDD and we need to write boot0hfs #--------------------------------------------------------------------- - echo "Executing command: fdisk -u -f ${diskloader} -y ${bootdisk}" - fdisk -u -f "${osxvolume}/${diskloader}" -y ${bootdisk} + #Azipkg: diskloader=boot0 ??? boot0hfs/boot0md - remenber this is for GPT!! + echo "Executing command: fdisk -u -f "${osxvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk}" + fdisk -u -f "${osxvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk} fi else echo "Diskupdate is false, so no stage 0 file was written" fi - #echo "Executing command: dd if=${partitionloader} of=${bootrdev}" #dd if="${osxvolume}/${partitionloader}" of=${bootrdev} -echo "Prepare Stage 1 loader" - -echo "Executing command: dd if=${bootrdev} count=1 bs=512 of=/tmp/origbs" -dd if=${bootrdev} count=1 bs=512 of=/tmp/origbs - -if [ ${efiformat} = "hfs" ]; then - echo "Executing command: cp ${osxvolume}/${partitionloaderhfs} /tmp/newbs" - cp "${osxvolume}/${partitionloaderhfs}" /tmp/newbs -fi - +# if we have an original EFI ("FAT"), copy boot1f32 to newbs if [ ${efiformat} = "msdos" ]; then - echo "Executing command: cp ${osxvolume}/${partitionloaderfat} /tmp/newbs" - cp "${osxvolume}/${partitionloaderfat}" /tmp/newbs + + echo "Prepare Stage 1 loader" + # copy partition boot sector to origbs + echo "Executing command: dd if=${bootrdev} count=1 bs=512 of=/tmp/origbs" + dd if=${bootrdev} count=1 bs=512 of=/tmp/origbs + + # copy boot1f32 to newbs + echo "Executing command: cp "${osxvolume}/usr/standalone/i386/${partitionloaderfat}" /tmp/newbs" + cp "${osxvolume}/usr/standalone/i386/${partitionloaderfat}" /tmp/newbs + + # "merge" origbs into newbs + echo "Executing command: dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc" + dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc + + echo "Write Stage 1 loader" + + # write newbs to the partition boot sector + echo "Executing command: dd if=/tmp/newbs of=${bootrdev}" + dd if=/tmp/newbs of=${bootrdev} +else + #Azipkg: this is was failing for me, hanged at boot0: done. Got fine when i removed "bs=512 count=1" ?? + # makes no sense but... anyway, i'd remove this!.. no need to change EFI fs if boot1f32 works fine. + # In fact, i'm not a fan of EFI installs so, i'd remove it all!! :) + echo "Write Stage 1 loader" + + # just write boot1h to the partition boot sector + echo "Executing command: dd if="${osxvolume}/usr/standalone/i386/${partitionloaderhfs}" of=${bootrdev}" + dd if="${osxvolume}/usr/standalone/i386/${partitionloaderhfs}" of=${bootrdev} fi -echo "Executing command: dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc" -dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc - -echo "Write Stage 1 loader" - -echo "Executing command: dd of=${bootrdev} count=1 bs=512 if=/tmp/newbs" -dd if=/tmp/newbs of=${bootrdev} count=1 bs=512 - echo "-----------------------------------------------" echo "" echo "" @@ -420,8 +429,8 @@ echo "Write Stage 2 loader" echo "********************" -echo "Executing command: cp ${osxvolume}${filesystemloader} ${bootvolume}/boot" -cp "${osxvolume}${filesystemloader}" "${bootvolume}/boot" +echo "Executing command: cp "${osxvolume}/usr/standalone/i386/${filesystemloader}" ${bootvolume}/boot" +cp "${osxvolume}/usr/standalone/i386/${filesystemloader}" "${bootvolume}/boot" echo "boot written" echo "-----------------------------------------------" Index: branches/blackosx/package/Scripts/Advanced/GUI/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/GUI/postinstall (revision 1532) +++ branches/blackosx/package/Scripts/Advanced/GUI/postinstall (revision 1533) @@ -31,4 +31,4 @@ outfile = open(plist, "w") outfile.write(body) -outfile.close() \ No newline at end of file +outfile.close() Index: branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall (revision 1532) +++ branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall (revision 1533) @@ -20,7 +20,7 @@ for line in infile: # if we finish the tags and haven't written LegacyLogo Yet if "" in line and LegacyLogoCheck == False: - line = " LegacyLogo\n" + line = " Legacy Logo\n" line += " Yes\n" line += "\n" LegacyLogoCheck = True Index: branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall (revision 1532) +++ branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall (revision 1533) @@ -20,7 +20,7 @@ for line in infile: # if we finish the tags and haven't written BootBanner Yet if "" in line and BootBannerCheck == False: - line = " BootBanner\n" + line = " Boot Banner\n" line += " No\n" line += "\n" BootBannerCheck = True Index: branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall (revision 1532) +++ branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall (revision 1533) @@ -31,4 +31,4 @@ outfile = open(plist, "w") outfile.write(body) -outfile.close() \ No newline at end of file +outfile.close() Index: branches/blackosx/package/Scripts/Post/postinstall =================================================================== --- branches/blackosx/package/Scripts/Post/postinstall (revision 1532) +++ branches/blackosx/package/Scripts/Post/postinstall (revision 1533) @@ -33,8 +33,8 @@ dest_vol="$3" fi -# delee the temporary Chameleon folder +# delete the temporary Chameleon folder rm -rf "$dest_vol/tmpcham" -echo "Done..." \ No newline at end of file +echo "Done..." Index: branches/blackosx/package/Scripts/Keymaps/postinstall.in =================================================================== --- branches/blackosx/package/Scripts/Keymaps/postinstall.in (revision 0) +++ branches/blackosx/package/Scripts/Keymaps/postinstall.in (revision 1533) @@ -0,0 +1,34 @@ +#!/usr/bin/python +# Script to add Graphics_Mode for Chameleon boot loaders + +import sys +import os +import shutil + +vol = str(sys.argv[3]) +boot = "/Extra/org.chameleon.Boot.plist" +plist = vol + boot +if not os.path.exists(plist): + shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist) + +infile = open(plist, "r") +# check if Graphics_Mode has been written or not +KeyLayoutCheck = False + +body = "" + +for line in infile: + # if we finish the tags and haven't written KeyLayout Yet + if "" in line and KeyLayoutCheck == False: + line = " KeyLayout\n" + line += " @@KEYMAP@@\n" + line += "\n" + KeyLayoutCheck = True + + body += line + +infile.close() + +outfile = open(plist, "w") +outfile.write(body) +outfile.close() Property changes on: branches/blackosx/package/Scripts/Keymaps/postinstall.in ___________________________________________________________________ Added: svn:executable + * Property changes on: branches/blackosx/package/dmg/ro.dmg ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/package/Resources/pl.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/package/Resources/pl.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/package/Resources/id.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/package/Resources/id.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/package/Resources/it.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/package/Resources/it.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf (revision 1532) +++ branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf (revision 1533) @@ -33,4 +33,4 @@ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs26 \cf0 Copyright \'a9 2011 -\b \cf3 Italian translation: ErmaC e scrax} +\b \cf3 Tradotto da : ErmaC e scrax} Index: branches/blackosx/package/Resources/hr-HR.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/package/Resources/hr-HR.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Resources/background.tiff ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/tiff Index: branches/blackosx/package/Resources/en.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/package/Resources/en.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/package/Resources/pt-BR.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/package/Resources/pt-BR.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/package/Resources/sr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/package/Resources/sr.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/package/Resources/es.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/package/Resources/es.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/package/Resources/fr.lproj/Description.html =================================================================== --- branches/blackosx/package/Resources/fr.lproj/Description.html (revision 0) +++ branches/blackosx/package/Resources/fr.lproj/Description.html (revision 1533) @@ -0,0 +1,32 @@ + + + + + + + + + +

Chameleon est une conbinaison de différent composants de boot loader.

+

Il est basé sur la "fake EFI" implémentation de David Elliott ajouté au projet  Apple's boot-132.

+


+

Chameleon à été amélioré avec les fonctions clé suivantes:

+


+

Les nouvelles fonctionnalités de Chameleon 2.0

+


+

- Interface graphique entierement customisable pour apporter un peu de couleur au Darwin Bootloader.

+

- Booter un DVD Retail en chargeant directement une image RAMDISK sans l'aide de programmes tierce.

+

- Hibernation:  Appréciez  l'affichage d'un apercu d'écran durant le démarrage  après mise en veille.

+

- SMBIOS override : pour modifier les valeur d'usines du SMBIOS.

+

- DSDT override : Utilisation d'un DSDT modifié pouvant résoudre quelques problemes .

+


+

- Device Property Injection via device-properties string dans boot.plist.

+

- Hybrid boot0 / boot1h pour disque dur partionnés en MBR et GPT .

+

- Détection du FSB automatique , mème pour les CPU AMD récents.

+

- Support du Apple Software RAID .

+


+

Pour des informations plus détaillées , visitez : http://chameleon.osx86.hu

+ + Index: branches/blackosx/package/Resources/fr.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/fr.lproj/Localizable.strings (revision 0) +++ branches/blackosx/package/Resources/fr.lproj/Localizable.strings (revision 1533) @@ -0,0 +1,233 @@ +ÿþ// General +"Chameleon_title" = "Chameleon"; +"Chameleon_description" = "Chameleon requiert trois fichiers essentiels: +boot0 (Sur le MBR du disque) il est responsable du chargement de boot1. +boot1 (Sur le secteur de boot de la partition) pour trouver boot2. +boot2 (A la racine de la partition) pour charger le noyau etc."; + +"Standard_title" = "Standard"; +"Standard_description" = "Installe les fichiers de Chameleon à la racine de la partition sélectionnée en utilisant soit boot0 soit boot0md en fonction du système et sans détruire une installation de Windows existante."; + +"EFI_title" = "EFI"; +"EFI_description" = "Installe les fichiers de Chameleon dans la partition cachée EFI en utilisant soit boot0 soit boot0md en fonction du système et sans détruire une installation de Windows existante."; + +"noboot_title" = "Ne pas installer de Chargeur de Démarrage"; +"noboot_description" = "Utile si vous ne voulez installer que les Extras."; + +// Modules + +"Module_title" = "Modules Chameleon"; +"Module_description" = "Le système de modules intégrés à Chameleon permet à un utilisateur ou un développeur d'étendre les fonctionnalités de base de Chameleon sans remplacer le fichier de démarrage principal."; + +"klibc_title" = "klibc"; +"klibc_description" = "This module provides a standard c library for modules to link to if the library provided by chameleon is insufficient. +This is currently only used by the uClibc++ library. +Source: http://www.kernel.org/pub/linux/libs/klibc/"; + +"AutoReso_title" = "Resolution"; +"AutoReso_description" = "This module reads the edid information from the monitor attached to the main display. +The module is currently not integrated into trunk and has minimal uses as it stands. +Additionally, the module will patch the vesa modes available in pre intel hd graphics cards to provide proper resolution while booting."; + +"uClibc_title" = "uClibc++"; +"uClibc_description" = "This module provides a minimalistic c++ runtime library for use in other modules. +This does not provide functionality by itself, instead it is used to allow for the c++ language to be used in other modules. +Please note that rtti and exceptions has both been disabled. +Source: http://cxx.uclibc.org/ +Dependencies: klibc"; + +"Keylayout_title" = "Keylayout"; +"Keylayout_description" = "Ce module permet de changer le plan de codage du clavier."; + +// Utility +"Utility_title" = "Utilitaires"; +"Utility_description" = "Fichiers optionnels pour aider lors de l'installation"; + +"PrefPanel_title" = "Panneau de Préferences"; +"PrefPanel_description" = "Installe le Panneau de Préférences pour Chameleon."; + +"SMBIOSDefault_title" = "SMBIOS.plist"; +"SMBIOSDefault_description" = "Copie un exemple de smbios.plist dans /Extra/Configuration."; + +"Documentation_title" = "Documentation"; +"Documentation_description" = "Installe le manuel d'installation et d'utilisation de Chameleon"; + +// Options +"Options_title" = "Boot Options"; +"Options_description" = "Create an /Extra/org.chameleon.Boot.plist and select your desired options to control Chameleon's settings."; + +"arch_title" = "arch=i386"; +"arch_description" = "Boots the kernel in 32bit mode rather than the default 64bit mode."; + +"InstantMenu_title" = "InstantMenu=Yes"; +"InstantMenu_description" = "Display the partition selection screen without showing the timeout screen."; + +"QuietBoot_title" = "QuietBoot=Yes"; +"QuietBoot_description" = "Enable quiet boot mode (no messages or prompt)."; + +"RestartFix_title" = "RestartFix=No"; +"RestartFix_description" = "Disables the automatically enabled restart fix."; + +"ShowInfo_title" = "ShowInfo=No"; +"ShowInfo_description" = "Disables display of partition and resolution details."; + +"DropSSDT_title" = "DropSSDT=Yes"; +"DropSSDT_description" = "Discard the motherboard's built-in SSDT tables."; + +"EthernetBuiltIn_title" = "EthernetBuiltIn=Yes"; +"EthernetBuiltIn_description" = "ajoute EthernetBuiltIn=y au fichier com.apple.Boot.plist, cette option ajoutera 'built-in' a votre carte ethernet."; + +"GraphicsEnabler_title" = "GraphicsEnabler=Yes"; +"GraphicsEnabler_description" = "Enables the option to autodetect NVIDIA based GPUs and inject the correct info."; + +"EnableC2State_title" = "EnableC2State=Yes"; +"EnableC2State_description" = "Enable specific Processor power state, C2."; + +"EnableC3State_title" = "EnableC3State=Yes"; +"EnableC3State_description" = "Enable specific Processor power state, C3."; + +"EnableC4State_title" = "EnableC4State=Yes"; +"EnableC4State_description" = "Enable specific Processor power state, C4."; + +// Advanced +"Advanced_title" = "Advanced"; +"Advanced_description" = "Select your advanced desired options to control Chameleon's settings."; + +"Npci_title" = "npci=0x2000"; +"Npci_description" = "Set the flag npci=0x2000 for the Kernel Flags"; + +"BootBanner_title" = "BootBanner=No"; +"BootBanner_description" = "Hides Chameleon's boot banner in GUI."; + +"LegacyLogo_title" = "LegacyLogo=Yes"; +"LegacyLogo_description" = "Use the legacy (grey on white) apple logo on the boot screen rather than the boot.png in the theme."; + +"SMBIOSdefaults_title" = "SMBIOSdefaults=Yes"; +"SMBIOSdefaults_description" = "Enables SMBIOSdefaults options."; + +"UseAtiROM_title" = "UseAtiROM=Yes"; +"UseAtiROM_description" = "Enables UseAtiROM options."; + +"UseNvidiaROM_title" = "UseNvidiaROM=Yes"; +"UseNvidiaROM_description" = "Enables UseNvidiaROM options."; + +"Wait_title" = "Wait=Yes"; +"Wait_description" = "Pauses the boot process after Chameleon has finished it's setup then waits for a key press before it starts the mach kernel. Useful when combined with verbose boot for troubleshooting."; + +"Wake_title" = "Wake=Yes"; +"Wake_description" = "Attempts to load the sleep image saved from last hibernation."; + +"GUI_title" = "GUI=No"; +"GUI_description" = "Désactive l'interface graphique."; + +"VBIOS_title" = "VBIOS=Yes"; +"VBIOS_description" = "Enables VBIOS option"; + +"GenerateCStates_title" = "Generate C-States=Yes"; +"GenerateCStates_description" = "Enable auto generation of processor idle sleep states (C-States)."; + +"GeneratePStates_title" = "Generate P-States=Yes"; +"GeneratePStates_description" = "Enable auto generation of processor power performance states (P-States)."; + +"CSTUsingSystemIO_title" = "New - Generate C-States=Yes"; +"CSTUsingSystemIO_description" = "New C-State _CST generation method using SystemIO registers instead of FixedHW."; + +"ForceHPET_title" = "ForceHPET=Yes"; +"ForceHPET_description" = "ajoute ForceHPET=y to com.apple.Boot.plist, Cette option active HPET sur les chipsets intel,(pour les bios qui n'ont pas cette options)."; + +"ForceWake_title" = "ForceWake=Yes"; +"ForceWake_description" = "réveille forcé, (ajoute l'option ForceWake=y au fichier com.apple.Boot.plist)"; + +"EHCIacquire_title" = "EHCIacquire=Yes"; +"EHCIacquire_description" = "fixe certains problème de branchement usb a chaud et de reconnaissance usb2 !"; + +"UHCIreset_title" = "UHCIreset=Yes"; +"UHCIreset_description" = "fixe quelques rares problèmes de detection usb"; + +"UseMemDetect_title" = "UseMemDetect=No"; +"UseMemDetect_description" = "Disables the automatically enabled RAM recognition."; + +// KeyLayout +"KeyLayout_title" = "KeyLayout"; +"KeyLayout_description" = "Fixe le plan de codage du clavier à utiliser"; + +"mac-de_title" = "Clavier Mac Allemand"; +"mac-de_description" = "Utilise le plan de codage pour un clavier Mac Allemand"; + +"mac-fr_title" = "Clavier Mac Français"; +"mac-fr_description" = "Utilise le plan de codage pour un clavier Mac Français"; + +"mac-es_title" = "Clavier Mac Espagnol"; +"mac-es_description" = "Utilise le plan de codage pour un clavier Mac Espagnol"; + +"mac-it_title" = "Clavier Mac Italien"; +"mac-it_description" = "Utilise le plan de codage pour un clavier Mac Italien"; + +"mac-se_title" = "Clavier Mac Suédois"; +"mac-se_description" = "Utilise le plan de codage pour un clavier Mac Suédois"; + +"pc-fr_title" = "Clavier PC Keyboard"; +"pc-fr_description" = "Utilise le plan de codage pour un clavier PC Français"; + +// Resolution +"Resolution_title" = "Resolution"; +"Resolution_description" = "Set the screen resolution of your display"; + +"1024x600x32_title" = "1024x600x32"; +"1024x600x32_description" = "1024x600x32"; + +"1024x768x32_title" = "1024x768x32"; +"1024x768x32_description" = "1024x768x32"; + +"1280x800x32_title" = "1280x800x32"; +"1280x800x32_description" = "1280x800x32"; + +"1280x1024x32_title" = "1280x1024x32"; +"1280x1024x32_description" = "1280x1024x32"; + +"1280x960x32_title" = "1280x960x32"; +"1280x960x32_description" = "1280x960x32"; + +"1440x900x32_title" = "1440x900x32"; +"1440x900x32_description" = "1440x900x32"; + +"1600x900x32_title" = "1600x900x32"; +"1600x900x32_description" = "1600x900x32"; + +"1680x1050x32_title" = "1680x1050x32"; +"1680x1050x32_description" = "1680x1050x32"; + +"1920x1080x32_title" = "1920x1080x32"; +"1920x1080x32_description" = "1920x1080x32"; + +"1920x1200x32_title" = "1920x1200x32"; +"1920x1200x32_description" = "1920x1200x32"; + +// Themes +"Themes_title" = "Themes"; +"Themes_description" = "Une collection de themes samplé +More themes can be found at http://forum.voodooprojects.org/index.php/board,7.0.html"; + +"Embed_title" = "Embed"; +"Embed_description" = "A smaller simple version of the new default theme used when building a version of Chameleon which requires an embedded theme. "; + +"Legacy_title" = "Legacy"; +"Legacy_description" = "Chameleon's previous default theme"; + +"Default_title" = "Standard"; +"Default_description" = "Ce theme est codé directement dans le fichier Boot, inclu ici pour vous comme base de customisation."; + +// Extras +"Extras_title" = "Extras"; +"Extras_description" = "une collection d'addons utiles"; + +"SMBios_title" = "SMBIOS Override"; +"SMBios_description" = "Installe le fichier de configuration SMBIOS smbios.plist into Extra"; + +// Error strings +"ERROR_BOOTVOL" = "Ce logiciel doit être installé sur le volume de démmarrage."; +"ERROR_INSTALL" = "Ce volume ne remplit pas les conditions requises pour cette mise à jour."; + +"Newer_Package_Installed_message" = "Une version plus récente de Chameleon est déjà installée"; +"Intel_Mac_message" = "Ce logiciel ne peut être installé sur cette ordinateur."; + \ No newline at end of file Index: branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf (revision 0) +++ branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf (revision 1533) @@ -0,0 +1,36 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} +{\colortbl;\red255\green255\blue255;\red65\green78\blue255;\red0\green0\blue255;} +\margl1440\margr1440\vieww11660\viewh12980\viewkind0 +\pard\ri0\qc + +\f0\b\fs72 \cf0 Chameleon +\fs50 \ + +\fs26 v%CHAMELEONVERSION% r%CHAMELEONREVISION% +\fs50 \ +\pard\ri0\ql\qnatural + +\fs26 \cf0 \ +\pard\ri0\qc + +\fs50 \cf2 %CHAMELEONSTAGE% +\fs26 \cf0 \ +\pard\ri0\ql\qnatural +\cf0 \ +D\'e9veloppeurs : %DEVELOP%\ +\ +Remerciements \'e0 : %CREDITS%\ +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs30 \cf0 \ +\pard\ri0\ql\qnatural + +\b\fs26 \cf0 Paquet r\'e9alis\'e9 par : %PKGDEV% +\b0\fs30 \ +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural +\cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\fs26 \cf0 Copyright \'a9 2011 +\b \cf3 Traduit par : jrcs} Index: branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf (revision 0) +++ branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf (revision 1533) @@ -0,0 +1,34 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350 +{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} +{\colortbl;\red255\green255\blue255;\red65\green78\blue255;\red255\green0\blue0;} +\margl1440\margr1440\vieww11660\viewh12980\viewkind0 +\pard\ri0\qc + +\f0\b\fs72 \cf0 Chameleon +\fs50 \ + +\fs26 v%CHAMELEONVERSION% r%CHAMELEONREVISION% +\fs50 \ +\ +\cf2 %CHAMELEONSTAGE%\cf0 \ +\pard\ri0\ql\qnatural + +\fs26 \cf0 \ +\pard\ri0\qc + +\fs50 \cf3 Installation Termin\'e9e ! +\b0\fs26 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\fs18 \cf0 \ +{\field{\*\fldinst{HYPERLINK "http://chameleon.osx86.hu/"}}{\fldrslt +\fs26 http://chameleon.osx86.hu/}} +\fs26 \ +{\field{\*\fldinst{HYPERLINK "http://forum.voodooprojects.org/index.php"}}{\fldrslt http://forum.voodooprojects.org/index.php}} +\b \ +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs30 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\fs26 \cf0 Copyright \'a9 2011} Index: branches/blackosx/package/Resources/fr.lproj/License.rtf =================================================================== --- branches/blackosx/package/Resources/fr.lproj/License.rtf (revision 0) +++ branches/blackosx/package/Resources/fr.lproj/License.rtf (revision 1533) @@ -0,0 +1,350 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350 +{\fonttbl\f0\fmodern\fcharset0 Courier-Bold;\f1\fmodern\fcharset0 Courier;} +{\colortbl;\red255\green255\blue255;} +\paperw12240\paperh15840\vieww22060\viewh18360\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\b\fs40 \cf0 APPLE PUBLIC SOURCE LICENSE \ + +\fs26 Version 2.0 - August 6, 2003\ +\ + +\f1\b0 Please read this License carefully before downloading this software. By downloading or using this software, you are agreeing to be bound by the terms of this License. If you do not or cannot agree to the terms of this License, please do not download or use the software.\ +\ +1. General; Definitions. This License applies to any program or other work which Apple Computer, Inc. ("Apple") makes publicly available and which contains a notice placed by Apple identifying such program or work as "Original Code" and stating that it is subject to the terms of this Apple Public Source License version 2.0 ("License"). As used in this License:\ +\ +1.1 "Applicable Patent Rights" mean: (a) in the case where Apple is the grantor of rights, (i) claims of patents that are now or hereafter acquired, owned by or assigned to Apple and (ii) that cover subject matter contained in the Original Code, but only to the extent necessary to use, reproduce and/or distribute the Original Code without infringement; and (b) in the case where You are the grantor of rights, (i) claims of patents that are now or hereafter acquired, owned by or assigned to You and (ii) that cover subject matter in Your Modifications, taken alone or in combination with Original Code.\ +\ +1.2 "Contributor" means any person or entity that creates or contributes to the creation of Modifications.\ +\ +1.3 "Covered Code" means the Original Code, Modifications, the combination of Original Code and any Modifications, and/or any respective portions thereof.\ +\ +1.4 "Externally Deploy" means: (a) to sublicense, distribute or otherwise make Covered Code available, directly or indirectly, to anyone other than You; and/or (b) to use Covered Code, alone or as part of a Larger Work, in any way to provide a service, including but not limited to delivery of content, through electronic communication with a client other than You.\ +\ +1.5 "Larger Work" means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.\ +\ +1.6 "Modifications" mean any addition to, deletion from, and/or change\ +to, the substance and/or structure of the Original Code, any previous\ +Modifications, the combination of Original Code and any previous\ +Modifications, and/or any respective portions thereof. When code is\ +released as a series of files, a Modification is: (a) any addition to\ +or deletion from the contents of a file containing Covered Code;\ +and/or (b) any new file or other representation of computer program\ +statements that contains any part of Covered Code.\ +\ +1.7 "Original Code" means (a) the Source Code of a program or other\ +work as originally made available by Apple under this License,\ +including the Source Code of any updates or upgrades to such programs\ +or works made available by Apple under this License, and that has been\ +expressly identified by Apple as such in the header file(s) of such\ +work; and (b) the object code compiled from such Source Code and\ +originally made available by Apple under this License.\ +\ +1.8 "Source Code" means the human readable form of a program or other\ +work that is suitable for making modifications to it, including all\ +modules it contains, plus any associated interface definition files,\ +scripts used to control compilation and installation of an executable\ +(object code).\ +\ +1.9 "You" or "Your" means an individual or a legal entity exercising\ +rights under this License. For legal entities, "You" or "Your"\ +includes any entity which controls, is controlled by, or is under\ +common control with, You, where "control" means (a) the power, direct\ +or indirect, to cause the direction or management of such entity,\ +whether by contract or otherwise, or (b) ownership of fifty percent\ +(50%) or more of the outstanding shares or beneficial ownership of\ +such entity.\ +\ +2. Permitted Uses; Conditions & Restrictions. Subject to the terms\ +and conditions of this License, Apple hereby grants You, effective on\ +the date You accept this License and download the Original Code, a\ +world-wide, royalty-free, non-exclusive license, to the extent of\ +Apple's Applicable Patent Rights and copyrights covering the Original\ +Code, to do the following:\ +\ +2.1 Unmodified Code. You may use, reproduce, display, perform,\ +internally distribute within Your organization, and Externally Deploy\ +verbatim, unmodified copies of the Original Code, for commercial or\ +non-commercial purposes, provided that in each instance:\ +\ +(a) You must retain and reproduce in all copies of Original Code the\ +copyright and other proprietary notices and disclaimers of Apple as\ +they appear in the Original Code, and keep intact all notices in the\ +Original Code that refer to this License; and\ +\ +(b) You must include a copy of this License with every copy of Source\ +Code of Covered Code and documentation You distribute or Externally\ +Deploy, and You may not offer or impose any terms on such Source Code\ +that alter or restrict this License or the recipients' rights\ +hereunder, except as permitted under Section 6.\ +\ +2.2 Modified Code. You may modify Covered Code and use, reproduce,\ +display, perform, internally distribute within Your organization, and\ +Externally Deploy Your Modifications and Covered Code, for commercial\ +or non-commercial purposes, provided that in each instance You also\ +meet all of these conditions:\ +\ +(a) You must satisfy all the conditions of Section 2.1 with respect to\ +the Source Code of the Covered Code;\ +\ +(b) You must duplicate, to the extent it does not already exist, the\ +notice in Exhibit A in each file of the Source Code of all Your\ +Modifications, and cause the modified files to carry prominent notices\ +stating that You changed the files and the date of any change; and\ +\ +(c) If You Externally Deploy Your Modifications, You must make\ +Source Code of all Your Externally Deployed Modifications either\ +available to those to whom You have Externally Deployed Your\ +Modifications, or publicly available. Source Code of Your Externally\ +Deployed Modifications must be released under the terms set forth in\ +this License, including the license grants set forth in Section 3\ +below, for as long as you Externally Deploy the Covered Code or twelve\ +(12) months from the date of initial External Deployment, whichever is\ +longer. You should preferably distribute the Source Code of Your\ +Externally Deployed Modifications electronically (e.g. download from a\ +web site).\ +\ +2.3 Distribution of Executable Versions. In addition, if You\ +Externally Deploy Covered Code (Original Code and/or Modifications) in\ +object code, executable form only, You must include a prominent\ +notice, in the code itself as well as in related documentation,\ +stating that Source Code of the Covered Code is available under the\ +terms of this License with information on how and where to obtain such\ +Source Code.\ +\ +2.4 Third Party Rights. You expressly acknowledge and agree that\ +although Apple and each Contributor grants the licenses to their\ +respective portions of the Covered Code set forth herein, no\ +assurances are provided by Apple or any Contributor that the Covered\ +Code does not infringe the patent or other intellectual property\ +rights of any other entity. Apple and each Contributor disclaim any\ +liability to You for claims brought by any other entity based on\ +infringement of intellectual property rights or otherwise. As a\ +condition to exercising the rights and licenses granted hereunder, You\ +hereby assume sole responsibility to secure any other intellectual\ +property rights needed, if any. For example, if a third party patent\ +license is required to allow You to distribute the Covered Code, it is\ +Your responsibility to acquire that license before distributing the\ +Covered Code.\ +\ +3. Your Grants. In consideration of, and as a condition to, the\ +licenses granted to You under this License, You hereby grant to any\ +person or entity receiving or distributing Covered Code under this\ +License a non-exclusive, royalty-free, perpetual, irrevocable license,\ +under Your Applicable Patent Rights and other intellectual property\ +rights (other than patent) owned or controlled by You, to use,\ +reproduce, display, perform, modify, sublicense, distribute and\ +Externally Deploy Your Modifications of the same scope and extent as\ +Apple's licenses under Sections 2.1 and 2.2 above.\ +\ +4. Larger Works. You may create a Larger Work by combining Covered\ +Code with other code not governed by the terms of this License and\ +distribute the Larger Work as a single product. In each such instance,\ +You must make sure the requirements of this License are fulfilled for\ +the Covered Code or any portion thereof.\ +\ +5. Limitations on Patent License. Except as expressly stated in\ +Section 2, no other patent rights, express or implied, are granted by\ +Apple herein. Modifications and/or Larger Works may require additional\ +patent licenses from Apple which Apple may grant in its sole\ +discretion.\ +\ +6. Additional Terms. You may choose to offer, and to charge a fee for,\ +warranty, support, indemnity or liability obligations and/or other\ +rights consistent with the scope of the license granted herein\ +("Additional Terms") to one or more recipients of Covered Code.\ +However, You may do so only on Your own behalf and as Your sole\ +responsibility, and not on behalf of Apple or any Contributor. You\ +must obtain the recipient's agreement that any such Additional Terms\ +are offered by You alone, and You hereby agree to indemnify, defend\ +and hold Apple and every Contributor harmless for any liability\ +incurred by or claims asserted against Apple or such Contributor by\ +reason of any such Additional Terms.\ +\ +7. Versions of the License. Apple may publish revised and/or new\ +versions of this License from time to time. Each version will be given\ +a distinguishing version number. Once Original Code has been published\ +under a particular version of this License, You may continue to use it\ +under the terms of that version. You may also choose to use such\ +Original Code under the terms of any subsequent version of this\ +License published by Apple. No one other than Apple has the right to\ +modify the terms applicable to Covered Code created under this\ +License.\ +\ +8. NO WARRANTY OR SUPPORT. The Covered Code may contain in whole or in\ +part pre-release, untested, or not fully tested works. The Covered\ +Code may contain errors that could cause failures or loss of data, and\ +may be incomplete or contain inaccuracies. You expressly acknowledge\ +and agree that use of the Covered Code, or any portion thereof, is at\ +Your sole and entire risk. THE COVERED CODE IS PROVIDED "AS IS" AND\ +WITHOUT WARRANTY, UPGRADES OR SUPPORT OF ANY KIND AND APPLE AND\ +APPLE'S LICENSOR(S) (COLLECTIVELY REFERRED TO AS "APPLE" FOR THE\ +PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS EXPRESSLY DISCLAIM\ +ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING, BUT\ +NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF\ +MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR\ +PURPOSE, OF ACCURACY, OF QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD\ +PARTY RIGHTS. APPLE AND EACH CONTRIBUTOR DOES NOT WARRANT AGAINST\ +INTERFERENCE WITH YOUR ENJOYMENT OF THE COVERED CODE, THAT THE\ +FUNCTIONS CONTAINED IN THE COVERED CODE WILL MEET YOUR REQUIREMENTS,\ +THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTED OR\ +ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED. NO\ +ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE\ +AUTHORIZED REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY.\ +You acknowledge that the Covered Code is not intended for use in the\ +operation of nuclear facilities, aircraft navigation, communication\ +systems, or air traffic control machines in which case the failure of\ +the Covered Code could lead to death, personal injury, or severe\ +physical or environmental damage.\ +\ +9. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO\ +EVENT SHALL APPLE OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL,\ +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING\ +TO THIS LICENSE OR YOUR USE OR INABILITY TO USE THE COVERED CODE, OR\ +ANY PORTION THEREOF, WHETHER UNDER A THEORY OF CONTRACT, WARRANTY,\ +TORT (INCLUDING NEGLIGENCE), PRODUCTS LIABILITY OR OTHERWISE, EVEN IF\ +APPLE OR SUCH CONTRIBUTOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\ +DAMAGES AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY\ +REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY OF\ +INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT APPLY\ +TO YOU. In no event shall Apple's total liability to You for all\ +damages (other than as may be required by applicable law) under this\ +License exceed the amount of fifty dollars ($50.00).\ +\ +10. Trademarks. This License does not grant any rights to use the\ +trademarks or trade names "Apple", "Apple Computer", "Mac", "Mac OS",\ +"QuickTime", "QuickTime Streaming Server" or any other trademarks,\ +service marks, logos or trade names belonging to Apple (collectively\ +"Apple Marks") or to any trademark, service mark, logo or trade name\ +belonging to any Contributor. You agree not to use any Apple Marks in\ +or as part of the name of products derived from the Original Code or\ +to endorse or promote products derived from the Original Code other\ +than as expressly permitted by and in strict compliance at all times\ +with Apple's third party trademark usage guidelines which are posted\ +at http://www.apple.com/legal/guidelinesfor3rdparties.html.\ +\ +11. Ownership. Subject to the licenses granted under this License,\ +each Contributor retains all rights, title and interest in and to any\ +Modifications made by such Contributor. Apple retains all rights,\ +title and interest in and to the Original Code and any Modifications\ +made by or on behalf of Apple ("Apple Modifications"), and such Apple\ +Modifications will not be automatically subject to this License. Apple\ +may, at its sole discretion, choose to license such Apple\ +Modifications under this License, or on different terms from those\ +contained in this License or may choose not to license them at all.\ +\ +12. Termination.\ +\ +12.1 Termination. This License and the rights granted hereunder will\ +terminate:\ +\ +(a) automatically without notice from Apple if You fail to comply with\ +any term(s) of this License and fail to cure such breach within 30\ +days of becoming aware of such breach;\ +\ +(b) immediately in the event of the circumstances described in Section\ +13.5(b); or\ +\ +(c) automatically without notice from Apple if You, at any time during\ +the term of this License, commence an action for patent infringement\ +against Apple; provided that Apple did not first commence\ +an action for patent infringement against You in that instance.\ +\ +12.2 Effect of Termination. Upon termination, You agree to immediately\ +stop any further use, reproduction, modification, sublicensing and\ +distribution of the Covered Code. All sublicenses to the Covered Code\ +which have been properly granted prior to termination shall survive\ +any termination of this License. Provisions which, by their nature,\ +should remain in effect beyond the termination of this License shall\ +survive, including but not limited to Sections 3, 5, 8, 9, 10, 11,\ +12.2 and 13. No party will be liable to any other for compensation,\ +indemnity or damages of any sort solely as a result of terminating\ +this License in accordance with its terms, and termination of this\ +License will be without prejudice to any other right or remedy of\ +any party.\ +\ +13. Miscellaneous.\ +\ +13.1 Government End Users. The Covered Code is a "commercial item" as\ +defined in FAR 2.101. Government software and technical data rights in\ +the Covered Code include only those rights customarily provided to the\ +public as defined in this License. This customary commercial license\ +in technical data and software is provided in accordance with FAR\ +12.211 (Technical Data) and 12.212 (Computer Software) and, for\ +Department of Defense purchases, DFAR 252.227-7015 (Technical Data --\ +Commercial Items) and 227.7202-3 (Rights in Commercial Computer\ +Software or Computer Software Documentation). Accordingly, all U.S.\ +Government End Users acquire Covered Code with only those rights set\ +forth herein.\ +\ +13.2 Relationship of Parties. This License will not be construed as\ +creating an agency, partnership, joint venture or any other form of\ +legal association between or among You, Apple or any Contributor, and\ +You will not represent to the contrary, whether expressly, by\ +implication, appearance or otherwise.\ +\ +13.3 Independent Development. Nothing in this License will impair\ +Apple's right to acquire, license, develop, have others develop for\ +it, market and/or distribute technology or products that perform the\ +same or similar functions as, or otherwise compete with,\ +Modifications, Larger Works, technology or products that You may\ +develop, produce, market or distribute.\ +\ +13.4 Waiver; Construction. Failure by Apple or any Contributor to\ +enforce any provision of this License will not be deemed a waiver of\ +future enforcement of that or any other provision. Any law or\ +regulation which provides that the language of a contract shall be\ +construed against the drafter will not apply to this License.\ +\ +13.5 Severability. (a) If for any reason a court of competent\ +jurisdiction finds any provision of this License, or portion thereof,\ +to be unenforceable, that provision of the License will be enforced to\ +the maximum extent permissible so as to effect the economic benefits\ +and intent of the parties, and the remainder of this License will\ +continue in full force and effect. (b) Notwithstanding the foregoing,\ +if applicable law prohibits or restricts You from fully and/or\ +specifically complying with Sections 2 and/or 3 or prevents the\ +enforceability of either of those Sections, this License will\ +immediately terminate and You must immediately discontinue any use of\ +the Covered Code and destroy all copies of it that are in your\ +possession or control.\ +\ +13.6 Dispute Resolution. Any litigation or other dispute resolution\ +between You and Apple relating to this License shall take place in the\ +Northern District of California, and You and Apple hereby consent to\ +the personal jurisdiction of, and venue in, the state and federal\ +courts within that District with respect to this License. The\ +application of the United Nations Convention on Contracts for the\ +International Sale of Goods is expressly excluded.\ +\ +13.7 Entire Agreement; Governing Law. This License constitutes the\ +entire agreement between the parties with respect to the subject\ +matter hereof. This License shall be governed by the laws of the\ +United States and the State of California, except that body of\ +California law concerning conflicts of law.\ +\ +Where You are located in the province of Quebec, Canada, the following\ +clause applies: The parties hereby confirm that they have requested\ +that this License and all related documents be drafted in English. Les\ +parties ont exige que le present contrat et tous les documents\ +connexes soient rediges en anglais.\ +\ +EXHIBIT A.\ +\ +"Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights\ +Reserved.\ +\ +This file contains Original Code and/or Modifications of Original Code\ +as defined in and that are subject to the Apple Public Source License\ +Version 2.0 (the 'License'). You may not use this file except in\ +compliance with the License. Please obtain a copy of the License at\ +http://www.opensource.apple.com/apsl/ and read it before using this\ +file.\ +\ +The Original Code and all software distributed under the License are\ +distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER\ +EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,\ +INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,\ +FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.\ +Please see the License for the specific language governing rights and\ +limitations under the License." } \ No newline at end of file Index: branches/blackosx/package/Resources/de.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/blackosx/package/Resources/de.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/package/buildpkg.sh =================================================================== --- branches/blackosx/package/buildpkg.sh (revision 1532) +++ branches/blackosx/package/buildpkg.sh (revision 1533) @@ -18,11 +18,11 @@ COL_BLUE="\x1b[34;01m" COL_RESET="\x1b[39;49;00m" -#version=$( grep I386BOOT_CHAMELEONVERSION sym/i386/vers.h | awk '{ print $3 }' | tr -d '\"' ) +#version=$( grep I386BOOT_CHAMELEONVERSION vers.h | awk '{ print $3 }' | tr -d '\"' ) version=$( cat version ) stage=${version##*-} -revision=$( grep I386BOOT_CHAMELEONREVISION sym/i386/vers.h | awk '{ print $3 }' | tr -d '\"' ) -builddate=$( grep I386BOOT_BUILDDATE sym/i386/vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) +revision=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' ) +builddate=$( grep I386BOOT_BUILDDATE vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) timestamp=$( date -j -f "%Y-%m-%d %H:%M:%S" "${builddate}" "+%s" ) # ================= @@ -47,9 +47,9 @@ rm -R -f "${1}" echo "" -echo -e $COL_BLACK" ----------------------------------"$COL_RESET -echo -e $COL_BLACK" Building $packagename Install Package"$COL_RESET -echo -e $COL_BLACK" ----------------------------------"$COL_RESET +echo -e $COL_CYAN" ----------------------------------"$COL_RESET +echo -e $COL_CYAN" Building $packagename Install Package"$COL_RESET +echo -e $COL_CYAN" ----------------------------------"$COL_RESET echo "" outline[$((outlinecount++))]="${indent[$xmlindent]}" @@ -61,13 +61,6 @@ mkdir -p ${1}/Core/Root/usr/sbin mkdir -p ${1}/Core/Root/usr/local/bin mkdir -p ${1}/Core/Root/usr/standalone/i386 -# if [ "$(ls -A "${1%/*}/i386/modules")" ]; then -# echo "Modules found." -# mkdir -p ${1}/Core/Root/usr/standalone/i386/modules -# cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386 -# else -# echo "No found modules into dir module" -# fi ditto --noextattr --noqtn ${1%/*}/i386/boot ${1}/Core/Root/usr/standalone/i386 ditto --noextattr --noqtn ${1%/*}/i386/boot0 ${1}/Core/Root/usr/standalone/i386 ditto --noextattr --noqtn ${1%/*}/i386/boot0md ${1}/Core/Root/usr/standalone/i386 @@ -121,13 +114,10 @@ ############################### # Supported Modules # ############################### - # AMDGraphicsEnabler.dylib # - # ATiGraphicsEnabler.dylib # - # IntelGraphicsEnabler.dylib # # klibc.dylib # - # NVIDIAGraphicsEnabler.dylib # # Resolution.dylib # # uClibcxx.dylib # + # Keylayout.dylib # ############################### if [ "$(ls -A "${1%/*}/i386/modules")" ]; then { @@ -135,7 +125,6 @@ choices[$((choicescount++))]="\n\n" ((xmlindent++)) packagesidentity="org.chameleon.modules" - # - if [ -e ${1%/*}/i386/modules/klibc.dylib ]; then { @@ -155,6 +144,27 @@ } fi # - + if [ -e ${1%/*}/i386/modules/Keylayout.dylib ]; then + { + mkdir -p ${1}/Keylayout/Root/Extra/{modules,Keymaps} + mkdir -p ${1}/Keylayout/Root/usr/bin + layout_src_dir="${1%/sym/*}/i386/modules/Keylayout/layouts/layouts-src" + if [ -d "$layout_src_dir" ];then + # Create a tar.gz from layout sources + (cd "$layout_src_dir"; \ + tar czf "${1}/Keylayout/Root/Extra/Keymaps/layouts-src.tar.gz" README *.slt) + fi + # Adding module + ditto --noextattr --noqtn ${1%/*}/i386/modules/Keylayout.dylib ${1}/Keylayout/Root/Extra/modules + # Adding Keymaps + ditto --noextattr --noqtn ${1%/sym/*}/Keymaps ${1}/Keylayout/Root/Extra/Keymaps + # Adding tools + ditto --noextattr --noqtn ${1%/*}/i386/cham-mklayout ${1}/Keylayout/Root/usr/bin + echo " [BUILD] Keylayout " + buildpackage "${1}/Keylayout" "/" "" "start_selected=\"true\"" >/dev/null 2>&1 + } + fi +# - if [ -e ${1%/*}/i386/modules/uClibcxx.dylib ]; then { mkdir -p ${1}/uClibc/Root @@ -237,6 +247,26 @@ done # End build base options packages + # build KeyLayout option packages + echo "================= Keymaps Options =================" + outline[$((outlinecount++))]="${indent[$xmlindent]}\t" + choices[$((choicescount++))]="\n\n" + ((xmlindent++)) + packagesidentity="org.chameleon.options.keylayout" + keymaps=($( find "${1%/sym/*}/Keymaps" -type f -depth 1 -name '*.lyt' | sed 's|.*/||;s|\.lyt||' )) + for (( i = 0 ; i < ${#keymaps[@]} ; i++ )) + do + mkdir -p "${1}/${keymaps[$i]}/Root/" + mkdir -p "${1}/${keymaps[$i]}/Scripts/" + sed "s/@@KEYMAP@@/${keymaps[$i]}/g" "${pkgroot}/Scripts/Keymaps/postinstall.in" > "${1}/${keymaps[$i]}/Scripts/postinstall" && \ + chmod +rx "${1}/${keymaps[$i]}/Scripts/postinstall" + echo " [BUILD] ${keymaps[$i]} " + buildpackage "${1}/${keymaps[$i]}" "/tmpcham" "" "start_selected=\"false\"" >/dev/null 2>&1 + done + ((xmlindent--)) + outline[$((outlinecount++))]="${indent[$xmlindent]}\t" + # End build KeyLayout option packages + # build resolution packages echo "================= Res. Options =================" outline[$((outlinecount++))]="${indent[$xmlindent]}\t" @@ -256,7 +286,7 @@ ((xmlindent--)) outline[$((outlinecount++))]="${indent[$xmlindent]}\t" # End build resolution packages - + # build Advanced packages echo "================= Adv. Options =================" outline[$((outlinecount++))]="${indent[$xmlindent]}\t" @@ -282,7 +312,7 @@ outline[$((outlinecount++))]="${indent[$xmlindent]}\t" # End build options packages - + # build theme packages echo "================= Themes =================" outline[$((outlinecount++))]="${indent[$xmlindent]}\t" @@ -462,8 +492,8 @@ # ---- # ditto -xk "${pkgroot}/Icons/pkg.zip" "${pkgroot}/Icons/" # DeRez -only icns "${pkgroot}/Icons/Icons/pkg.icns" > tempicns.rsrc -# Rez -append tempicns.rsrc -o "${1%/*}/${packagename// /}-${version}-r${revision}.pkg" -# SetFile -a C "${1%/*}/${packagename// /}-${version}-r${revision}.pkg" +# Rez -append tempicns.rsrc -o "${1%/*}/$packagename-${version}-r$revision.pkg" +# SetFile -a C "${1%/*}/$packagename-${version}-r$revision.pkg" # rm -f tempicns.rsrc # rm -rf "${pkgroot}/Icons/Icons" # End @@ -472,17 +502,17 @@ echo "MD5 (${packagename// /}-${version}-r${revision}.pkg) = ${md5}" > "${1%/*}/${packagename// /}-${version}-r${revision}.pkg.md5" echo "" - echo -e $COL_BLACK" --------------------------"$COL_RESET - echo -e $COL_BLACK" Building process complete!"$COL_RESET - echo -e $COL_BLACK" --------------------------"$COL_RESET + echo -e $COL_GREEN" --------------------------"$COL_RESET + echo -e $COL_GREEN" Building process complete!"$COL_RESET + echo -e $COL_GREEN" --------------------------"$COL_RESET echo "" - echo -e $COL_BLACK" Build info." - echo -e $COL_BLACK" ===========" - echo -e $COL_BLUE" Package name: "$COL_BLACK"$packagename-${version}-r$revision.pkg"$COL_RESET - echo -e $COL_BLUE" MD5: "$COL_BLACK"$md5"$COL_RESET - echo -e $COL_BLUE" Version: "$COL_BLACK"$version"$COL_RESET - echo -e $COL_BLUE" Stage: "$COL_BLACK"$stage"$COL_RESET - echo -e $COL_BLUE" Date/Time: "$COL_BLACK"$builddate"$COL_RESET + echo -e $COL_GREEN" Build info." + echo -e $COL_GREEN" ===========" + echo -e $COL_BLUE" Package name: "$COL_RESET"$packagename-${version}-r$revision.pkg" + echo -e $COL_BLUE" MD5: "$COL_RESET"$md5" + echo -e $COL_BLUE" Version: "$COL_RESET"$version" + echo -e $COL_BLUE" Stage: "$COL_RESET"$stage" + echo -e $COL_BLUE" Date/Time: "$COL_RESET"$builddate" echo "" } Property changes on: branches/blackosx/package/Icons/pan.zip ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Icons/tm.zip ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Icons/pkg.zip ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Icons/doc.zip ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Icons/dmg.zip ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Icons/Icon.zip ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: branches/blackosx/package/Icons/i386.zip ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: branches/blackosx/CREDITS =================================================================== --- branches/blackosx/CREDITS (revision 1532) +++ branches/blackosx/CREDITS (revision 1533) @@ -3,11 +3,11 @@ Developers: ---------- -zef, Turbo, dfe, netkas, mackerintel, fassl, Kabyl, kaitek, iNDi, asereBLN, mozodojo, meklort, AzimutZ, Slice, cosmo1t, cparm +zef, Turbo, dfe, netkas, mackerintel, fassl, Kabyl, kaitek, iNDi, JrCs, asereBLN, mozodojo, meklort, AzimutZ, Slice, cosmo1t, cparm Thanks to: --------- -JrCs, mercurysquad, munky, rekursor, kalyway, Krazubu, XyZ, blackosx, DHP, nawcom, anval, scorpius, macman +mercurysquad, munky, rekursor, kalyway, Krazubu, XyZ, blackosx, DHP, nawcom, anval, scorpius, macman Package: --------- Index: branches/blackosx/doc/BootHelp.txt =================================================================== --- branches/blackosx/doc/BootHelp.txt (revision 1532) +++ branches/blackosx/doc/BootHelp.txt (revision 1533) @@ -72,6 +72,9 @@ and /S/L/E/Extensions.mkext. Default is No but Yes if you use Lion on a Raid partition. + KeyLayout=keymap Use to change the keyboard mapping of the bootloader + (e.g. KeyLayout=mac-fr) + GraphicsEnabler=Yes|No Automatic device-properties generation for gfx cards. AtiConfig= Use a different card config, e.g. AtiConfig=Megalodon. AtiPorts= Specify the number of ports, e.g. AtiPorts=2. @@ -107,6 +110,8 @@ (C-States). GeneratePStates=Yes Enable auto generation of processor power performance states (P-States). + CSTUsingSystemIO=Yes New C-State _CST generation method using SystemIO + registers instead of FixedHW. EnableC2State=Yes Enable specific Processor power state, C2. EnableC3State=Yes Enable specific Processor power state, C3. Index: branches/blackosx/Make.rules =================================================================== --- branches/blackosx/Make.rules (revision 1532) +++ branches/blackosx/Make.rules (revision 1533) @@ -1,7 +1,7 @@ + -include $(SRCROOT)/auto.conf export USE_APPLE_PB_SUPPORT = all - ifneq "" "$(wildcard /bin/mkdirs)" MKDIRS = /bin/mkdirs @@ -20,6 +20,7 @@ CPPFLAGS = $(MORECPP) -g -Wmost -Werror -fno-exceptions -fno-rtti DEFINES= +DIST_SUBDIRS += $(SUBDIRS) # # Common makefile targets. @@ -74,7 +75,7 @@ @$(CC) -Wa,-n -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) boot2.s \ -MD -dependency-file $*.d @md -u $(OBJROOT)/Makedep -f -d $*.d - + $(OBJROOT)/%.o: %.s @echo "\t[AS] $<" @$(CC) $(CPPFLAGS) -c $(INC) -arch i386 -o $@ $< \ @@ -82,18 +83,82 @@ @md -u $(OBJROOT)/Makedep -f -d $*.d +CONFIG_FILES=$(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/autoconf.inc $(SRCROOT)/.config +$(CONFIG_FILES): $(SRCROOT)/.config + @echo "\t[MAKE] config" + @make -C $(SRCROOT)/i386/config rebuild_config +HEADER_VERSION=$(SRCROOT)/vers.h +$(HEADER_VERSION): $(SRCROOT)/version + @echo "#define I386BOOT_VERSION \"5.0.132\"" > $@ + @echo "#define I386BOOT_BUILDDATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $@ + @echo "#define I386BOOT_CHAMELEONVERSION \"`cat $(SRCROOT)/version`\"" >> $@ + @echo "#define I386BOOT_CHAMELEONREVISION \"`svnversion -n | tr -d [:alpha:]`\"" >> $@ + +CONFIG_HEADERS=$(CONFIG_FILES) $(HEADER_VERSION) + # This breaks make, must use make all (FIXME) $(DIRS_NEEDED) $(INSTALLDIR) $(OBJROOT) $(SYMROOT): @echo "\t[MKDIR] $@" @$(MKDIRS) $@ - -$(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/.config: - @echo "\t[MAKE] config" - @cd $(SRCROOT) && make rebuild_config -.PHONY: clean -clean: - @for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@ ); done +# Recursive rules +RECURSIVE_TARGETS = all-recursive +RECURSIVE_CLEAN_TARGETS = distclean-recursive clean-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo ================= Making $$target in $$subdir =================; \ + (cd $$subdir && $(MAKE) $$target) \ + || eval $$failcom; \ + done; + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-local"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $$local_target) \ + || eval $$failcom; \ + done + +clean-dep: + @if [ -f "$(OBJROOT)/Makedep" ];then echo "\t[RM] $(OBJROOT)/Makedep"; fi + @rm -f $(OBJROOT)/Makedep + +clean: clean-recursive clean-dep + +distclean: distclean-recursive clean-local clean-dep + +clean-local: + +distclean-local: + .DEFAULT_GOAL := all + +# Local Variables: # +# mode: Makefile # +# tab-width: 2 # +# indent-tabs-mode: t # +# End: # +# +# vi: set noexpandtab ts=2 sw=2 sts=2: # Index: branches/blackosx/Makefile =================================================================== --- branches/blackosx/Makefile (revision 1532) +++ branches/blackosx/Makefile (revision 1533) @@ -1,5 +1,5 @@ # Makefile for kernel booter -SRCROOT = $(shell pwd) +SRCROOT = $(CURDIR) OBJROOT = $(SRCROOT)/obj SYMROOT = $(SRCROOT)/sym DSTROOT = $(SRCROOT)/dst @@ -27,73 +27,30 @@ EXCLUDE = --exclude=.svn --exclude=.DS_Store --exclude=sym --exclude=obj \ --exclude=package --exclude=archive --exclude=User_Guide_src --exclude=*.sh +#RC_CFLAGS = i386 ARCHLESS_RC_CFLAGS=`echo $(RC_CFLAGS) | sed 's/-arch [a-z0-9]*//g'` GENERIC_SUBDIRS = +SUBDIRS = $(GENERIC_SUBDIRS) i386 +DIST_SUBDIRS = $(SUBDIRS) +$(SRCROOT)/revision: + @svnversion -n | tr -d [:alpha:] > $(SRCROOT)/revision + # # Currently builds for i386 # config rebuild_config: - @if [ -e ".svn" ]; then svnversion -n | tr -d [:alpha:] > revision; fi - @echo ================= make config for i386 =================; - @( OBJROOT=$(OBJROOT)/i386; \ - SYMROOT=$(SYMROOT)/i386; \ - DSTROOT=$(DSTROOT); \ - SRCROOT=$(SRCROOT); \ - cd i386; ${MAKE} \ - "OBJROOT=$$OBJROOT" \ - "SYMROOT=$$SYMROOT" \ - "DSTROOT=$$DSTROOT" \ - "SRCROOT=$$SRCROOT" \ - "RC_ARCHS=$$RC_ARCHS" \ - "TARGET=$$i" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$$XCFLAGS" $@ \ - ) || exit $$?; \ + @make -C $(SRCROOT)/i386/config $@ +all: $(SYMROOT) $(OBJROOT) $(CONFIG_HEADERS) $(HEADER_VERSION) $(SRCROOT)/revision + @$(MAKE) all-recursive -all: $(SYMROOT) $(OBJROOT) $(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/autoconf.inc $(SRCROOT)/.config $(SYMROOT)/i386/vers.h - @if [ -e ".svn" ]; then svnversion -n | tr -d [:alpha:] > revision; fi - @if [ -z "$(RC_ARCHS)" ]; then \ - RC_ARCHS="i386"; \ - fi; \ - SUBDIRS="$(GENERIC_SUBDIRS) $$RC_ARCHS"; \ - for i in $$SUBDIRS; \ - do \ - if [ -d $$i ]; then \ - echo ================= make $@ for $$i =================; \ - ( OBJROOT=$(OBJROOT)/$${i}; \ - SYMROOT=$(SYMROOT)/$${i}; \ - DSTROOT=$(DSTROOT); \ - SRCROOT=$(SRCROOT); \ - XCFLAGS=$(ARCHLESS_RC_CFLAGS); \ - GENSUBDIRS="$(GENERIC_SUBDIRS)"; \ - for x in $$GENSUBDIRS; \ - do \ - if [ "$$x" == "$$i" ]; then \ - XCFLAGS="$(RC_CFLAGS)"; \ - break; \ - fi \ - done; \ - cd $$i; ${MAKE} \ - "OBJROOT=$$OBJROOT" \ - "SYMROOT=$$SYMROOT" \ - "DSTROOT=$$DSTROOT" \ - "SRCROOT=$$SRCROOT" \ - "RC_ARCHS=$$RC_ARCHS" \ - "TARGET=$$i" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$$XCFLAGS" $@ \ - ) || exit $$?; \ - else \ - echo "========= nothing to build for $$i ========="; \ - fi; \ - done - dist image: all + @# To force the read of auto.conf (generated by 'all' target) + @make $@-local + +dist-local image-local: @echo "================= Distrib =================" @echo "\t[RM] ${IMGROOT}" @rm -rf ${IMGROOT} @@ -118,8 +75,19 @@ @cp -f ${SYMROOT}/i386/boot0md ${IMGROOT}/usr/standalone/i386 @cp -f ${SYMROOT}/i386/boot1h ${IMGROOT}/usr/standalone/i386 @cp -f ${SYMROOT}/i386/boot1f32 ${IMGROOT}/usr/standalone/i386 +ifdef CONFIG_FDISK440 @cp -f ${SYMROOT}/i386/fdisk440 ${IMGROOT}/usr/bin +endif +ifdef CONFIG_BDMESG @cp -f ${SYMROOT}/i386/bdmesg ${IMGROOT}/usr/bin +endif +ifdef CONFIG_KEYLAYOUT_MODULE + @cp -f ${SYMROOT}/i386/cham-mklayout ${IMGROOT}/usr/bin + @echo "\t[MKDIR] ${IMGROOT}/Extra/Keymaps" + @mkdir -p ${IMGROOT}/Extra/Keymaps + @echo "\t[CP] Keymaps ${IMGROOT}/Extra/Keymaps" + @cp -R -f "Keymaps"/* "${IMGROOT}/Extra/Keymaps/" +endif @echo "\t[HDIUTIL] ${ISOIMAGE}" @hdiutil makehybrid -iso -joliet -hfs -hfs-volume-name \ @@ -131,20 +99,26 @@ @gzip --best ${DISTFILE}.tar @mv ${DISTFILE}.tar.gz ${DISTFILE}.tgz -clean: - @echo "\t[RM] $(OBJROOT)" - @echo "\t[RM] $(SYMROOT)" - @echo "\t[RM] $(DSTROOT)" - @echo "\t[RM] $(SRCROOT)/revision" - @echo "\t[RM] $(SRCROOT)/i386/modules/module_includes" - @echo "\t[RM] $(SRCROOT)/auto.conf" - @echo "\t[RM] $(SRCROOT)/autoconf.h" - @echo "\t[RM] $(SRCROOT)/autoconf.inc" +clean-local: + @if [ -f "$(HEADER_VERSION)" ];then echo "\t[RM] $(HEADER_VERSION)"; fi + @if [ -f "$(SRCROOT)/revision" ];then echo "\t[RM] $(SRCROOT)/revision"; fi + @rm -f $(HEADER_VERSION) $(SRCROOT)/revision - @rm -rf $(OBJROOT) $(SYMROOT) $(DSTROOT) $(SRCROOT)/revision \ +distclean-local: + @if [ -d "$(OBJROOT)" ];then echo "\t[RMDIR] $(OBJROOT)"; fi + @if [ -d "$(SYMROOT)" ];then echo "\t[RMDIR] $(SYMROOT)"; fi + @if [ -d "$(DSTROOT)" ];then echo "\t[RMDIR] $(DSTROOT)"; fi + @if [ -d "$(SRCROOT)/i386/modules/module_includes" ];then \ + echo "\t[RMDIR] $(SRCROOT)/i386/modules/module_includes"; \ + fi + @if [ -f "$(SRCROOT)/auto.conf" ];then echo "\t[RM] $(SRCROOT)/auto.conf"; fi + @if [ -f "$(SRCROOT)/autoconf.h" ];then echo "\t[RM] $(SRCROOT)/autoconf.h"; fi + @if [ -f "$(SRCROOT)/autoconf.inc" ];then echo "\t[RM] $(SRCROOT)/autoconf.inc"; fi + + @rm -rf $(OBJROOT) $(SYMROOT) $(DSTROOT) \ $(SRCROOT)/i386/modules/module_includes \ - $(SRCROOT)/auto.conf \ - $(SRCROOT)/autoconf.h \ + $(SRCROOT)/auto.conf \ + $(SRCROOT)/autoconf.h \ $(SRCROOT)/autoconf.inc pkg installer: all @@ -152,15 +126,6 @@ @echo "\t[GZ] ${DISTFILE}.pkg" @gzip --best ${DISTFILE}.pkg - -$(SYMROOT)/i386/vers.h: version - @echo "#define I386BOOT_VERSION \"5.0.132\"" > $@ - @echo "#define I386BOOT_BUILDDATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $@ - @echo "#define I386BOOT_CHAMELEONVERSION \"`cat version`\"" >> $@ - @echo "#define I386BOOT_CHAMELEONREVISION \"`svnversion -n | tr -d [:alpha:]`\"" >> $@ - - -.PHONY: $(SYMROOT)/i386/vers.h .PHONY: config .PHONY: clean .PHONY: image Property changes on: branches/blackosx ___________________________________________________________________ Modified: svn:ignore - obj sym revision build .config* auto.conf autoconf.h autoconf.inc + obj sym revision build .config* auto.conf autoconf.h autoconf.inc vers.h Added: svn:mergeinfo Merged /trunk:r1491-1532