colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-30 20:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for broken steam with new build system.

Browse Source 
Reviewed by me.
This commit is contained in:
Francisco Tolmasky committed 2008-12-06 15:12:05 -08:00
1 parent ab40761a6c
commit 5babf3708e
3 files changed
+55 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Tools/nib2cib/build.xml
+2 -2
View File
@@ -20,8 +20,8 @@
<arg line = "-f nib2cib.steam -c ${Configuration} -t nib2cib" />
</steam-build>
<copy todir = "${Build.nib2cib.lib}/nib2cib">
<fileset dir = "${Build}/${Configuration}/nib2cib" />
<copy todir = "${Build.nib2cib.lib}">
<fileset dir = "${Build}/${Configuration}/nib2cib/" />
</copy>
<copy file = "nib2cib" tofile = "${Build.nib2cib.bin}/nib2cib" />
Tools/steam/steam.js
+35 -16
View File
@@ -382,30 +382,49 @@ function mainCreate()
{
if (arguments.length < 1)
printUsage("create");
var dst = arguments[0],
link = arguments[1] == "-l";
var link = false,
index = 0,
count = arguments.length;
var srcNewApp = new File(OBJJ_HOME+"/lib/NewApplication"),
srcFrameworks = new File(OBJJ_HOME+"/lib/Frameworks"),
dstNewApp = new File(dst),
dstFrameworks = new File(dst+"/Frameworks");
System.out.println(srcNewApp.getCanonicalPath() + "," + dstNewApp.getCanonicalPath() + "," + srcFrameworks.getCanonicalPath() + "," + dstFrameworks.getCanonicalPath());
if (!dstNewApp.exists())
for (; index < count; ++index)
{
exec(["cp", "-vR", srcNewApp.getCanonicalPath(), dstNewApp.getCanonicalPath()], true);
var argument = arguments[index];
switch (arguments[index])
{
case "-l": link = true;
break;
default: destination = argument;
}
}
var sourceNewApplication = new File(OBJJ_HOME + "/lib/NewApplication"),
destinationNewApplication = new File(destination),
sourceFrameworks = new File(OBJJ_HOME + "/lib/Frameworks"),
sourceDebugFrameworks = new File(OBJJ_HOME + "/lib/Frameworks-Debug"),
destinationFrameworks = new File(destination + "/Frameworks"),
destinationDebugFrameworks = new File(destination + "/Frameworks-Debug");
System.out.println(sourceNewApplication.getCanonicalPath() + "," + destinationNewApplication.getCanonicalPath() + "," + sourceFrameworks.getCanonicalPath() + "," + destinationFrameworks.getCanonicalPath());
if (!destinationNewApplication.exists())
{
exec(["cp", "-vR", sourceNewApplication.getCanonicalPath(), destinationNewApplication.getCanonicalPath()], true);
if (!link)
exec(["cp", "-vR", srcFrameworks.getCanonicalPath(), dstFrameworks.getCanonicalPath()], true);
{
exec(["cp", "-vR", sourceDebugFrameworks.getCanonicalPath(), destinationDebugFrameworks.getCanonicalPath()], true);
exec(["cp", "-vR", sourceFrameworks.getCanonicalPath(), destinationFrameworks.getCanonicalPath()], true);
}
else
exec(["ln", "-s", new File(System.getenv("STEAM_BUILD")+"/Release").getCanonicalPath(), dstFrameworks.getCanonicalPath()], true);
{
exec(["ln", "-s", new File(System.getenv("STEAM_BUILD") + "/Debug").getCanonicalPath(), destinationDebugFrameworks.getCanonicalPath()], true);
exec(["ln", "-s", new File(System.getenv("STEAM_BUILD") + "/Release").getCanonicalPath(), destinationFrameworks.getCanonicalPath()], true);
}
}
else
{
System.out.println("Directory already exists");
}
}
function mainBuild()
build.xml
+18 -17
View File
@@ -194,22 +194,6 @@
<fileset dir = "Tools/NewApplication" />
</copy>
<copy todir = "${Build.Cappuccino.Tools.Lib}/NewApplication/Frameworks">
<fileset dir = "${Build}/Release/">
<include name = "Objective-J/" />
<include name = "Foundation/" />
<include name = "AppKit/" />
</fileset>
</copy>
<copy todir = "${Build.Cappuccino.Tools.Lib}/NewApplication/Frameworks-Debug">
<fileset dir = "${Build}/Debug/">
<include name = "Objective-J/" />
<include name = "Foundation/" />
<include name = "AppKit/" />
</fileset>
</copy>
<!-- FIXME: This is awful, we need to handle this like we handle Demos -->
<git-clone-pull repository = "git://github.com/280north/ojunit.git" dest = "${Build}/Release/ojunit" />
@@ -267,9 +251,26 @@
<!-- Starter Package -->
<copy todir = "${Build.Cappuccino.Starter}/NewApplication">
<fileset dir = "${Build.Cappuccino.Tools.Lib}/NewApplication/" />
<fileset dir = "Tools/NewApplication/" />
</copy>
<copy todir = "${Build.Cappuccino.Starter}/NewApplication/Frameworks">
<fileset dir = "${Build}/Release/">
<include name = "Objective-J/" />
<include name = "Foundation/" />
<include name = "AppKit/" />
</fileset>
</copy>
<copy todir = "${Build.Cappuccino.Starter}/NewApplication/Frameworks-Debug">
<fileset dir = "${Build}/Debug/">
<include name = "Objective-J/" />
<include name = "Foundation/" />
<include name = "AppKit/" />
</fileset>
</copy>
<!-- Zip -->
<zip destfile = "${Build.Cappuccino}/Starter.zip">