Skip to content

Commit

Permalink
updated buildinfo
Browse files Browse the repository at this point in the history
  • Loading branch information
fearthecowboy committed Jul 23, 2013
1 parent 4fa3ff3 commit 1ce0246
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 32 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
contrib/coapp/Output
contrib/coapp/Intermediate
*.nupkg
50 changes: 25 additions & 25 deletions contrib/coapp/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
@import default_tools;

default {

("v110, v100", "Win32, x64", "Debug,Release", "Dynamic, Static, ltcg", "cdecl,stdcall") => {
.PushEnvironment {};
.LoadSystemEnvironment {};
.SetEnvironmentFromTarget.Target = "VC_${0}_${1}";
.Message.Text = @"


Env: ${0}-${1} : ${2} ${3} ${4}
EnvExists: $(IsEnvironmentValid)";

.Exec {
Condition="$(IsEnvironmentValid)";
Command = @"msbuild $(MSBuildThisFileDirectory)zlib.vcxproj /p:PlatformToolset=${0};Platform=${1};Configuration=${2};UsesConfigurationType=${3};CallingConvention=${4}";
};

.PopEnvironment{};
};

#define {
ProjectName = "zlib";
ProjectFiles : {
zlib.vcxproj
};
};

clean {
.RemoveDir.Directories = @"$(MSBuildThisFileDirectory).\intermediate";
default {
(PlatformToolsets, Architectures, ReleaseOrDebug, Linkage, "cdecl,stdcall" ) => {
.MsBuildEx {
MaxThreads = $(MaxThreads);
LoadEnvironmentFromTargets = VC_${0}_${1};
StartMessage = @"Environment vc_${0}_${1} -- ${2} ${3} ";
Properties: {
PlatformToolset=${0};
Platform=${1};
Configuration=${2};
UsesConfigurationType=${3};
CallingConvention=${4}
};

Projects=${ProjectFiles};
};
};

// wait for all threaded tasks to finish.
.WaitForTasks { };
};

nuke {
.RemoveDir.Directories = @"$(MSBuildThisFileDirectory).\output";
};
7 changes: 0 additions & 7 deletions contrib/coapp/zlib.autopkg
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,6 @@ nuget {

};

// the VC++ .props file that gets generated and inserted into the ${d_content} folder
props {
// we're going to generate a number of properties anyway.
// so even if the packager doesn't specify the props object
// we're going to make this file.
};

// the VC++ .targets file that gets generated and inserted into the ${d_content} folder
targets {
Defines += HAS_ZLIB;
Expand Down

0 comments on commit 1ce0246

Please sign in to comment.