Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix windows build process, manostool improvements #126

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix windows build process, manostool improvements #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8342e21
Specify Mono.* dlls to live in the lib path if they're not in the GAC…
imphasing Jul 20, 2011
bfc40ff
Add IsWindows property to Environment so we can switch things around …
imphasing Jul 20, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/Manos/Manos.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,15 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Mono.Posix" />
<Reference Include="Mono.CSharp" />
<Reference Include="Mono.C5" />
<Reference Include="Mono.Posix">
<HintPath>..\..\libs\Mono.Posix.dll</HintPath>
</Reference>
<Reference Include="Mono.CSharp">
<HintPath>..\..\libs\Mono.CSharp.dll</HintPath>
</Reference>
<Reference Include="Mono.C5">
<HintPath>..\..\libs\Mono.C5.dll</HintPath>
</Reference>
<Reference Include="Nini, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c9892194e1b9ec1b">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\libs\Nini.dll</HintPath>
Expand Down
30 changes: 21 additions & 9 deletions src/manostool/Driver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class Driver
public static readonly string COMPILED_TEMPLATES_ASSEMBLY = "CompiledTemplates.dll";
public static readonly string TEMPLATES_DIRECTORY = "Templates";
public static readonly string DEPLOYMENT_DIRECTORY = "Deployment";
public static readonly string MANOS_TOOLNAME = "manostool";

private static Environment Environment = new Environment ();

Expand All @@ -65,7 +66,7 @@ public static int Main (string[] args)
try {
extra = p.Parse(args);
} catch (OptionException){
Console.WriteLine ("Try `manos --help' for more information.");
Console.WriteLine (string.Format ("Try `{0} --help' for more information.", MANOS_TOOLNAME));
return 1;
}

Expand Down Expand Up @@ -115,7 +116,7 @@ private static string [] ParseGlobalOptions (string [] args)
try {
extra = p.Parse(args);
} catch (OptionException){
Console.WriteLine ("Try `manos --help' for more information.");
Console.WriteLine (string.Format ("Try `{0} --help' for more information.", MANOS_TOOLNAME));
return null;
}

Expand All @@ -128,11 +129,16 @@ private static string [] ParseGlobalOptions (string [] args)
private static int Init (IList<string> args)
{
if (args.Count < 1) {
Console.WriteLine ("manos --init <AppName>");
Console.WriteLine (string.Format ("{0} --init <AppName>", MANOS_TOOLNAME));
Console.WriteLine ("This will initialize a new application with the supplied name.");
}

Driver d = new Driver ();

if (args.Count <= 0) {
Console.WriteLine ("Error: Unable to init without an AppName.");
return 1;
}

try {
Console.WriteLine ("initing: {0}", args [0]);
Expand Down Expand Up @@ -276,18 +282,24 @@ public void RunBuild ()

private static int ShowEnvironment (IList<string> args)
{
Console.WriteLine ("libdir: '{0}'", Environment.LibDirectory);
Console.WriteLine ("manosdir: '{0}'", Environment.ManosDirectory);
Console.WriteLine ("workingdir: '{0}'", Environment.WorkingDirectory);
Console.WriteLine ("datadir: '{0}'", Environment.DataDirectory);
Console.WriteLine ("datadir: '{0}'", Environment.DocsDirectory);
if (Environment.IsWindows) {
Console.WriteLine ("manosdir: '{0}'", Environment.ManosDirectory);
Console.WriteLine ("datadir: '{0}'", Environment.DataDirectory);
Console.WriteLine ("docsdir: '{0}'", Environment.DocsDirectory);
} else {
Console.WriteLine ("libdir: '{0}'", Environment.LibDirectory);
Console.WriteLine ("manosdir: '{0}'", Environment.ManosDirectory);
Console.WriteLine ("workingdir: '{0}'", Environment.WorkingDirectory);
Console.WriteLine ("datadir: '{0}'", Environment.DataDirectory);
Console.WriteLine ("docsdir: '{0}'", Environment.DocsDirectory);
}

return 1;
}

private static void ShowHelp (OptionSet os)
{
Console.WriteLine ("manos usage is: manos [command] [options]");
Console.WriteLine (string.Format ("{0} usage is: {0} [command] [options]", MANOS_TOOLNAME));
Console.WriteLine ();
os.WriteOptionDescriptions (Console.Out);
}
Expand Down
7 changes: 7 additions & 0 deletions src/manostool/Environment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@ public Environment ()
LibDirectory = "lib";
TemplatesDirectory = "Templates";
WorkingDirectory = Directory.GetCurrentDirectory ();
IsWindows = false;

string exe_path = new Uri (typeof (Driver).Assembly.GetName ().CodeBase).LocalPath;

if (System.Environment.OSVersion.Platform == PlatformID.Win32NT
|| System.Environment.OSVersion.Platform == PlatformID.Win32S
|| System.Environment.OSVersion.Platform == PlatformID.Win32Windows
|| System.Environment.OSVersion.Platform == PlatformID.WinCE) {
IsWindows = true;
ManosDirectory = Path.GetDirectoryName(exe_path);
DataDirectory = ManosDirectory;
DocsDirectory = Path.Combine(ManosDirectory, "docs");
Expand Down Expand Up @@ -88,5 +90,10 @@ public string DocsDirectory {
get;
set;
}

public bool IsWindows {
get;
private set;
}
}
}