Skip to content

Commit

Permalink
Almost looks like sqlite might just be working again...
Browse files Browse the repository at this point in the history
  • Loading branch information
mterwoord_cp authored and mterwoord_cp committed Jul 28, 2013
1 parent c4feb83 commit 517d531
Show file tree
Hide file tree
Showing 50 changed files with 1,823 additions and 40,336 deletions.
22 changes: 9 additions & 13 deletions Setup2/Cosmos.iss
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ Source: ".\Build\VSIP\XSC.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversi
Source: ".\Build\VSIP\Cosmos.Deploy.USB.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\Cosmos.Build.Common.dll"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\Mosa.Utility.IsoImage.dll"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\EntityFramework.dll"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\System.Data.SQLite.dll"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\System.Data.SQLite.LinqEx.dll"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly
;
Source: ".\Build\VSIP\Cosmos.Deploy.Pixie.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly

Expand All @@ -169,7 +172,6 @@ Source: ".\Build\VSIP\Cosmos.Core.*"; DestDir: "{app}\Kernel"; Flags: ignorevers
Source: ".\Build\VSIP\Cosmos.Hardware.*"; DestDir: "{app}\Kernel"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\Cosmos.System.*"; DestDir: "{app}\Kernel"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\Cosmos.Common.Extensions.*"; DestDir: "{app}\Kernel"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\FirebirdSql.Data.FirebirdClient.*"; DestDir: "{app}\Kernel"; Flags: ignoreversion uninsremovereadonly

; Icon
Source: ".\source2\Cosmos.ico"; DestDir: "{app}"; Flags: ignoreversion uninsremovereadonly
Expand All @@ -178,17 +180,12 @@ Source: ".\source2\Cosmos.ico"; DestDir: "{app}"; Flags: ignoreversion uninsremo
Source: ".\source2\Compiler\Cosmos.Compiler.DebugStub\*.xs"; DestDir: "{app}\XSharp\DebugStub\"; Flags: ignoreversion uninsremovereadonly

; System.Data.SQLite library
Source: ".\Resources\Dependencies\SQLite\System.Data.SQLite.dll"; DestDir: "{pf32}\MSBuild\Cosmos"; Flags: ignoreversion uninsremovereadonly
Source: ".\Resources\Dependencies\SQLite\System.Data.SQLite.pdb"; DestDir: "{pf32}\MSBuild\Cosmos"; Flags: ignoreversion uninsremovereadonly
Source: ".\Resources\Dependencies\SQLite\System.Data.SQLite.Linq.dll"; DestDir: "{pf32}\MSBuild\Cosmos"; Flags: ignoreversion uninsremovereadonly
Source: ".\Resources\Dependencies\SQLite\System.Data.SQLite.Linq.pdb"; DestDir: "{pf32}\MSBuild\Cosmos"; Flags: ignoreversion uninsremovereadonly
Source: ".\Resources\Dependencies\SQLite\System.Data.SQLite.dll"; DestDir: "{app}\Build\VSIP"; Flags: ignoreversion uninsremovereadonly
Source: ".\Resources\Dependencies\SQLite\System.Data.SQLite.pdb"; DestDir: "{app}\Build\VSIP"; Flags: ignoreversion uninsremovereadonly
Source: ".\Resources\Dependencies\SQLite\System.Data.SQLite.Linq.dll"; DestDir: "{app}\Build\VSIP"; Flags: ignoreversion uninsremovereadonly
Source: ".\Resources\Dependencies\SQLite\System.Data.SQLite.Linq.pdb"; DestDir: "{app}\Build\VSIP"; Flags: ignoreversion uninsremovereadonly

; EntityFramework library
Source: ".\source\packages\EntityFramework.5.0.0-rc\lib\net40\EntityFramework.dll"; DestDir: "{app}\Build\VSIP"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\EntityFramework.dll"; DestDir: "{app}\Build\VSIP"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\System.Data.SQLite.dll"; DestDir: "{app}\Build\VSIP"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\System.Data.SQLite.LinqEx.dll"; DestDir: "{app}\Build\VSIP"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\EntityFramework.dll"; DestDir: "{app}\MSBuild\Cosmos"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\System.Data.SQLite.dll"; DestDir: "{app}\MSBuild\Cosmos"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\System.Data.SQLite.LinqEx.dll"; DestDir: "{app}\MSBuild\Cosmos"; Flags: ignoreversion uninsremovereadonly

; VSIP stuff
Source: ".\Build\VSIP\Cosmos.targets"; DestDir: "{pf32}\MSBuild\Cosmos"; Flags: ignoreversion uninsremovereadonly
Expand Down Expand Up @@ -389,7 +386,6 @@ Root: HKCR; SubKey: Cosmos.ProjectFile\shell\open\command; ValueType: string; Va
Filename: {code:VSNET2010_PATH}\VSIXInstaller.exe; Parameters: "/quiet /u:e2ce86d3-fb0b-43ad-938a-5bcdd087ea2d"; Flags: waituntilterminated
Filename: {code:VSNET2010_PATH}\VSIXInstaller.exe; Parameters: "/quiet /u:e2ce86d3-fb0b-43ad-938a-5bcdd087ea2d"; Flags: waituntilterminated
Filename: {code:VSNET2010_PATH}\VSIXInstaller.exe; Parameters: "/quiet ""{app}\Build\VSIP\Cosmos.VS.XSharp.vsix"""; Flags: waituntilterminated
Filename: "{app}\Build\Tools\sqllite.exe"; Flags: waituntilterminated

; Forces VS to merge the resource metadata that describes menus, toolbars, and command groups from all VSPackages available.
#if BuildConfiguration == "Devkit"
Expand Down
2 changes: 1 addition & 1 deletion Setup2/ReadMe.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright � 2007-2012 The Cosmos Project
Copyright � 2007-2013 The Cosmos Project
4 changes: 4 additions & 0 deletions XSharp/source/XSharp.Nasm/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>

</configuration>
2 changes: 2 additions & 0 deletions XSharp/source/XSharp.Nasm/XSharp.Nasm.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand All @@ -52,6 +53,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="Cosmos.snk" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 517d531

Please sign in to comment.