Skip to content

Commit

Permalink
updated the IE build
Browse files Browse the repository at this point in the history
Updated the IE build to work independently of the Unix make process.
  • Loading branch information
creswick committed Apr 2, 2014
1 parent be8c805 commit 8d2cb9f
Show file tree
Hide file tree
Showing 7 changed files with 265 additions and 194 deletions.
63 changes: 63 additions & 0 deletions .gitattributes
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
1 change: 1 addition & 0 deletions src/js/internet-explorer/.gitignore
Expand Up @@ -2,3 +2,4 @@ bin/
obj/
*.suo
*.snk
packages/
44 changes: 22 additions & 22 deletions src/js/internet-explorer/FiveUI.sln
@@ -1,22 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiveUI", "FiveUI\FiveUI.csproj", "{0DC9AB90-4115-4334-BD9C-0A4092A071E6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0DC9AB90-4115-4334-BD9C-0A4092A071E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0DC9AB90-4115-4334-BD9C-0A4092A071E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0DC9AB90-4115-4334-BD9C-0A4092A071E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0DC9AB90-4115-4334-BD9C-0A4092A071E6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiveUI", "FiveUI\FiveUI.csproj", "{0DC9AB90-4115-4334-BD9C-0A4092A071E6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0DC9AB90-4115-4334-BD9C-0A4092A071E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0DC9AB90-4115-4334-BD9C-0A4092A071E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0DC9AB90-4115-4334-BD9C-0A4092A071E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0DC9AB90-4115-4334-BD9C-0A4092A071E6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions src/js/internet-explorer/FiveUI/.gitignore
@@ -1 +1,2 @@
*.res
data

0 comments on commit 8d2cb9f

Please sign in to comment.