Commit Graph

282 Commits

Author SHA1 Message Date
liamDevine
1fdb95e142 VS200X Environment Args. Does not use the flag EnvironmentArgsInherit 2011-08-22 10:51:28 +01:00
liamDevine
80eff1c9fd Adds environmentargs for vs10 and flags which define specifics for them.
Flags
EnvironmentArgsDontMerge - Default is to merge these Environment arguments specified with the current environment args.
EnvironmentArgsInherit - Inherits from parent or project defaults.
2011-08-22 10:14:42 +01:00
liamDevine
89c197a189 Arrrr didn't test that last one before committing. I hang my head in shame. 2011-08-22 00:57:59 +01:00
liamDevine
53e5a796cb Oops left a couple of variables which were used to find the error. See last commit for info. 2011-08-22 00:56:11 +01:00
liamDevine
8cb574e685 The function premake.action.set (which I only see used in xcode3 tests) has a secret,
it not only sets the action yet can also set the global _OS. Currently when the function is used in
a test suite it should really be reset in a teardown. To make this transparent I have added the
caching of the _OS value set in C code in testfx and it is reset in 'test_setup' with the other
environment resets.
I had a quick look at the commits and can not see how or when this first caused a problem yet findlib
was failing on windows as previous premake.action.set('xcode3') had been made and therefore the
library it was looking for was 'm'.

io.eol is another potential setting which leaves a dirty environment for tests.
2011-08-22 00:52:49 +01:00
Jason Perkins
a887942037 Added virtual path support for CodeBlocks 2011-08-19 08:58:12 -04:00
Jason Perkins
b101ac117a Fixed Xcode3 bug with sources in a subdirectory and grouped in virtual path 2011-08-16 12:22:08 -04:00
Jason Perkins
112483417b Added virtual path support to Xcode3 2011-08-15 16:00:20 -04:00
Jason Perkins
1a074ba81b Added vpath support to VC200x and Codelite 2011-08-09 16:11:35 -04:00
Jason Perkins
f8877df6ea Flipped vpaths syntax, now ['group']={'pattern(s)'...} 2011-07-19 18:07:30 -04:00
Jason Perkins
1631cff164 Removed a bunch of deprecated VC2010 code 2011-07-12 16:55:27 -04:00
Jason Perkins
144c608442 Implemented vpaths for VS2010 2011-07-01 15:05:16 -04:00
Liam Devine
52ef4b7079 Pulling stable change into dev. 2011-05-27 16:19:07 +01:00
Liam Devine
8d66a5cb12 Incorrect relative paths for gmake sibling static libraries 2011-05-27 15:55:06 +01:00
Jason Perkins
eccd1720ba More cleanup; preparing the virtual path stuff 2011-05-18 17:32:04 -04:00
Jason Perkins
655d6a8a95 Prepped CodeBlocks for new file configs 2011-05-12 16:14:43 -04:00
Jason Perkins
f7609a9fa5 Ported CodeLite to trees 2011-05-12 16:00:07 -04:00
Jason Perkins
eedf10ef6a Tweaks and tests for VS2010 file handling 2011-05-10 13:56:25 -04:00
Liam Devine
8f11c2c5f6 merge with stable 2011-05-07 03:05:16 +01:00
Liam Devine
fb7f74d4bd Fixed bug 3297634 - UnitTest++ folder breaks Xcode 3
Xcode itself only quotes when it needs to yet it is fine to always quote the string.
2011-05-07 02:30:28 +01:00
liamDevine
adb2529b61 Applied patch which sets the target machine in visual studio 2011-05-01 03:09:27 +01:00
Unknown
5ec9f16415 set the platform in vs10 static libs 2011-05-01 01:04:27 +01:00
Liam Devine
33eff629c4 removing dead code 2011-04-30 22:33:52 +01:00
Liam Devine
700cd82280 corrected teardown function name in testing_make_linking.lua
stopped 'runall' from running 'setup' and 'teardown' as tests which also stops the inflated test count that I noticed.
Added writing of runtime to io for test suites.
Added prj = premake.solution.getproject(sln, 1) to vs10 tests and removed the managed flag hack.
2011-04-30 22:29:54 +01:00
liamDevine
6c7b1939d8 ignore entry point in Manged C++ 2011-04-30 00:57:49 +01:00
liamDevine
2773fd8c1c removing dead code and also drawing attention to flags on projects when unit testing 2011-04-30 00:29:30 +01:00
liamDevine
df11537b80 Adding Managed C++ support for vs10 2011-04-30 00:25:12 +01:00
liamDevine
e5da7de916 merge with stable 2011-04-29 23:44:53 +01:00
Unknown
a0fa8c04e0 Fixes Bug 3294459: vs10 x86_64 using incorrect debug format for minimal rebuild
there is not an option for setting /Z7 OldStyle so OldStyle was removed
/ZI is not compatible with /clr or x64_64
minimal Rebuild requires /Zi in x86_64
2011-04-29 02:07:38 +01:00
Jason Perkins
229e31a465 [#1657833] Set working directory an IDE starts/debugs the program in 2011-04-25 15:55:17 -04:00
Jason Perkins
0357046d36 Merged changes from stable 2011-04-11 14:33:49 -04:00
Liam Devine
37432fef37 gmake correctly links again to SharedLibs and StaticLibs sibling dependencies; yet correctly does not link to a non linkable sibling. 2011-03-29 02:27:10 +01:00
Liam Devine
5ac9af4c8a Commenting out latest changes so that stable is not broken. The test is left in and will fail while I look at the problem with gmake. 2011-03-29 00:08:26 +01:00
Liam Devine
f9027da963 sln was in global and not reset to nil in teardown 2011-03-26 01:37:26 +00:00
Liam Devine
26db36c266 * Patch 3043933 gmake incorrectly links using -l when a solution contains a .so and .a of the same name and the static lib is wanted (Jonathan Derque) 2011-03-26 00:21:44 +00:00
Jason Perkins
d9f30a983a Fixed failed merge 2011-03-24 17:09:58 -04:00
Jason Perkins
ccb5d34c95 Merged with premake-stable 2011-03-23 17:05:19 -04:00
Liam Devine
801808062d 3157645: Respects full path for xcode frameworks 2011-03-23 15:00:51 +00:00
liamDevine
ea9ac28488 pdb file was being written to the 'Link' section when it needed to be in 'ClCompile'. Reported by hodsondd closes bug report: https://sourceforge.net/tracker/?func=detail&aid=3163703&group_id=71616&atid=531878 2011-03-14 14:59:59 +00:00
Liam Devine
a02fd77b74 Xcode4 workspace relative location paths and workspace generation 2011-03-11 17:08:37 +00:00
Liam Devine
98b9815534 Xcode4 workspace initial 2011-03-11 16:43:19 +00:00
Jason Perkins
bb94e9de81 [#3100379] C# support for Visual Studio 2010 2011-02-16 15:16:07 -05:00
Jason Perkins
b3dfe26ec6 Ported VS2005 *.csproj to trees 2011-02-09 11:22:02 -05:00
Jason Perkins
aa090b0cd3 Ported VS2002 *.csproj from walksources to trees 2011-02-08 11:08:16 -05:00
Jason Perkins
43218e0e96 Moved io.capture to test framework; removed from test suites 2011-02-03 16:38:32 -05:00
Jason Perkins
df2b2e3a6d Cleaned up and standardized namespaces in vstudio code 2011-02-02 13:27:52 -05:00
Jason Perkins
ad515a7ac3 Port VS200x from walksources() to trees 2011-01-22 14:51:54 -05:00
Jason Perkins
1c06557bc9 Merged with stable 2011-01-02 15:53:26 -05:00
liamDevine
fb54aea2fa Removes the setting of WholeProgramOptimization for vs10 projects as per the msdn docs. 2010-12-30 15:40:12 +00:00
Jason Perkins
7fe1f9150c Merge with stable 2010-12-27 16:21:15 -05:00
Liam Devine
200f0d6c4b Sets ONLY_ACTIVE_ARCH = YES in Xcode debug builds to mirror Xcode created projects 2010-12-09 23:47:47 +00:00
Liam Devine
6a251c8577 adds GCC_SYMBOLS_PRIVATE_EXTERN = NO; which should be the default for builds. This fixes a Release build yet not Debug as Xcode itself is broken. Bug 2920784 and Feature 3118000 2010-12-09 23:08:54 +00:00
Jason Perkins
854aa65741 More SNC changes: fixed location of PCH to match VS, fixed flags 2010-12-06 06:45:22 -05:00
Jason Perkins
b8f2684004 Switched PS3 builds from GCC to SNC 2010-12-02 06:56:35 -05:00
Jason Perkins
8e469cf3a5 More stable/dev merging 2010-12-02 06:25:15 -05:00
Liam Devine
778c7b508f typo fix 2010-12-01 13:19:24 +00:00
Liam Devine
e4fb04b09c fixes ClCompile blocks with PCH's in Vs10 generator 2010-12-01 13:10:44 +00:00
liamDevine
83dbac114c Typo correction 2010-11-02 00:30:06 +00:00
liamDevine
1ba4125df5 adds NoIncrementalLink to vs200X 2010-11-02 00:08:25 +00:00
liamDevine
707729d408 removed dead tests
readded the behaviour that if cfg.kind is StaticLib then there is not LinkIncremental section
2010-11-01 23:30:15 +00:00
liamDevine
ecdf201d61 Vs10 implementing NoLinkIncrementally flag.
This changes the behaviour that was the previous.
Previously it could be set to true, false or omitted all together, now it is either true or false; was this wanted?
2010-11-01 22:30:31 +00:00
liamDevine
ad5e8061c6 vs10 64bit builds can not use /ZI http://msdn.microsoft.com/en-us/library/958x11bc(v=VS.100).aspx 2010-11-01 02:20:35 +00:00
liamDevine
6e1e761fea fixes vs10 to only add a pdb when the symbols flag in used 2010-11-01 00:34:59 +00:00
liamDevine
67b3e45aa4 Fixes vs10 DebugInformationFormat 2010-11-01 00:26:24 +00:00
liamDevine
420e381d47 applies miminal rebuild change to vs10 that was applied in changeset 0b3e27b8eac6 for vs200x 2010-10-31 23:56:07 +00:00
liamDevine
6c7968aba6 adds local keyword to buffer instances 2010-10-31 23:24:15 +00:00
liamDevine
e89e0eb8e7 Fixes vs10 Bug 3100062 uses premake.config.isdebugbuild to determine debug status 2010-10-31 23:18:15 +00:00
liamDevine
3f0b545424 removes invalid test in vs2010 filters
refactored moving more code in the function "if_config_and_platform" for vs2010
added write_file_compile_block which takes care of pre compiled headers and fixes Bug 3095274
Did lines ending changes in vs2010_vcxproj.lua and test_vs2010_vcxproj.lua which is why the changeset is bigger??
2010-10-30 11:55:40 +01:00
liamDevine
51abe69396 removes invalid test in vs2010 filters
removes dead function vs10_helpers.table_of_filters
2010-10-30 01:16:33 +01:00
liamDevine
a51fc3da63 Bug 3097868: Patch 3076517 premake_rev465.patch. Removes relative paths from vs2010 filters (Robert Konrad) 2010-10-30 00:43:12 +01:00
Jason Perkins
9ec77bf550 Bug 3015312: Makefiles are not quoted correctly 2010-10-21 06:41:52 -04:00
Jason Perkins
e52f458c6c Bug 3020382: GCC PCH not working 2010-10-19 07:14:46 -04:00
Jason Perkins
4a515d8df6 Bug 3034222: StaticLib projects ignore linkoptions 2010-10-13 10:20:26 -04:00
Jason Perkins
781f1cf792 Improved portability of Premake's Mac OS X binaries (William Burnson) 2010-10-11 12:25:55 -04:00
Jason Perkins
6c5022bf39 Patch 3063804: Set CompileAs flag for VS200x C projects (rjmyst3) 2010-09-14 06:36:40 -04:00
Jason Perkins
683d391ae7 Bug 3007101: Generating PDB in Release builds is not supported 2010-09-05 16:10:28 -04:00
Jason Perkins
8e84aa4efe Bug 3056381: Xcode project breaks on special chars 2010-09-05 14:47:42 -04:00
liamDevine
5f688dfeee linkoptions added and refactored for all "kinds" 2010-07-28 01:25:07 +01:00
liamDevine
0382a1c310 embedded scripts 2010-07-27 20:02:11 +01:00
liamDevine
df4e215fef Resource script now put in correct ItemGroup which is ResourceCompile inside a *.vcxproj 2010-07-27 19:25:36 +01:00
liamDevine
408a94ebae Added config_type to the namespace premake.vstudio.vs10_helpers from local scope
Fixed config_type not returning Application for a WindowedApp
2010-07-27 16:24:00 +01:00
Jason Perkins
425684bef8 Merged Liam's VS2010 changes 2010-07-20 16:37:52 -04:00
LiamDevine
5c49aa8638 Moved remaining functions from global and added them to the table premake.vstudio.vs10_helpers 2010-07-14 23:31:31 +01:00
Jason Perkins
46aa8cbd65 Merged VS 2010 C/C++ support (Liam Devine) 2010-07-13 09:05:13 -04:00
Jason Perkins
68f49d30bd Fixed handling of icons in Xcode (bitshifter) 2010-07-13 08:18:33 -04:00
LiamDevine
6415760b8a Fixed bug where a filter path had a dot in it's path
added C support
2010-06-21 20:49:20 +01:00
LiamDevine
4df8255508 added MFC support
changed to use only one configuration block
2010-06-21 17:38:50 +01:00
LiamDevine
947c13faea UseDebugLibraries --added to config
whole program optimisation --added
		added--- SmallerTypeCheck set to true when flags contain extra warnings and no optimisation
2010-06-21 14:33:48 +01:00
LiamDevine
2e6b86c1c0 changed any comments to line from blocks as parser failed
addded postfix slashes to int and out dirs
removed quotes from event hooks
moved event hooks to correct location
added target name to prevent warnings due to changes in vs using MSBuild
changed errors in wildcard searches that for some reason I was using through out
Found error in that a clean operation was registered within actions yet another function is called.
Can currently generate sln and proj files for C++ using most configs and compile then, see todo for exceptions
2010-06-20 01:07:39 +01:00
LiamDevine
ff650b85cf faulty test was passing. fixed 2010-06-18 00:49:48 +01:00
LiamDevine
d1eb9852fe pulled changes from premake repos 2010-06-18 00:33:25 +01:00
LiamDevine
f00217f741 removed invalid assumptions which were checked in unit tests
added link section even when a static lib
added ProgramDatabaseFile to link section
2010-06-18 00:27:34 +01:00
LiamDevine
db0f215e95 added failing test for ImportLibrary to remind me there is an unknown 2010-06-17 00:47:45 +01:00
LiamDevine
917217bc8f Never saved before commit oops 2010-06-17 00:30:52 +01:00
LiamDevine
b96a354aba Moved filter functions into core from test file 2010-06-17 00:30:14 +01:00
LiamDevine
5c4d3cd478 check why <MinimalRebuild>true</MinimalRebuild> is missing in a debug static lib and shared lib build
--------Requires symbols to be set in flags
shared lib missing <DebugInformationFormat>EditAndContinue</DebugInformationFormat> in ClCompile section
--------Requires symbols to be set in flags
shared lib incorrectly <GenerateDebugInformation>true</GenerateDebugInformation> to false in link section
--------Requires symbols to be set in flags


shared lib LinkIncremental set to incorrect value of false
	---Fixed and tests wrote

check all configs %(AdditionalIncludeDirectories) missing before AdditionalIncludeDirectories end tag in ClCompile
	---Fixed if no include Directories supplied, this tag is not present
2010-06-16 23:50:57 +01:00
LiamDevine
e1ca7109f1 Identified problems which need fixing 2010-06-16 19:34:21 +01:00
LiamDevine
223b5429f0 checked lib section for a static lib 2010-06-16 19:20:41 +01:00
LiamDevine
50e1665c34 the failed test has some how disapeared.
removed link section when kind is a static lib
2010-06-16 18:21:29 +01:00
LiamDevine
b27b21ce82 changed path seperators to window specific \\ 2010-06-16 00:35:41 +01:00
LiamDevine
70a93c68bc vcxproj.filters done
vcxproj.user done
vcxproj nearly done
2010-06-15 23:29:56 +01:00
LiamDevine
3f67eb5d7f vcxproj support getting there 2010-06-11 22:07:07 +01:00
Jason Perkins
6426050f83 Patch 3011940: Add support for MFC (JTAnderson) 2010-06-10 19:34:50 -04:00
LiamDevine
7b61224398 hmm missing tests 2010-06-10 18:15:49 +01:00
LiamDevine
4484d388a4 vs2010 started vcxproj 2010-06-10 16:45:25 +01:00
Cameron Hart
e5d2b2f0ae Added test case for Xcode icon images 2010-05-10 15:53:45 +12:00
starkos
c861bafe84 Added framework to vstudio C# 2005 2010-03-04 21:51:20 +00:00
starkos
0da8416c9b Began work on new frameworks() api 2010-03-04 21:01:45 +00:00
starkos
d4143dae74 Feature 2944697: Add flag to disable Minimal Rebuild in Visual Studio 2010-03-03 13:40:56 +00:00
starkos
430fbc3fa4 Bug 2931722: pchheader handling not consistent between tools 2010-02-26 22:10:57 +00:00
starkos
0f49283f60 Alpha sort files in Xcode projects 2010-01-05 19:27:34 +00:00
starkos
0ab0451c09 Support targetprefix in Xcode 2009-12-31 22:52:02 +00:00
starkos
4a179ae704 Few fixes for targetsuffix 2009-12-17 15:08:38 +00:00
starkos
70636a4510 Split build commands out by configuration 2009-12-14 16:09:53 +00:00
starkos
c963a76892 Bug 2912756: dylibs missing lib prefix 2009-12-12 17:29:53 +00:00
starkos
9a3bf8e5e5 Bug 2910639: Nil reference on dylib project dependency 2009-12-09 18:40:56 +00:00
starkos
b51c75e70d Bug 2909463: Fix Xcode handling of Obj-C++ .mm files 2009-12-07 21:54:34 +00:00
starkos
c0a7128a3c Implemented prebuild, prelink, and postbuild commands 2009-12-03 21:07:24 +00:00
starkos
a39c338896 Implemented platforms 2009-12-03 20:28:42 +00:00
starkos
c858deabdd Added linking to system libraries 2009-12-03 15:27:13 +00:00
starkos
fcff55ee47 Added NoExceptions, NoFramePointer, NoPCH, NoRTTI, libdirs, precompiled headers 2009-12-03 14:55:11 +00:00
starkos
14b7a2ca5d Implemented buildoptions, ExtraWarnings, FatalWarnings, FloatFast, FloatStrict, NoEditAndContinue, Symbols 2009-12-01 21:29:44 +00:00
starkos
a0f7ffc87e Fixed paths to dependent projects 2009-11-29 15:51:10 +00:00
starkos
00709e1074 Added PBXTargetDependency section 2009-11-29 15:37:39 +00:00
starkos
70349b3bdd Added PBXReferenceProxy section 2009-11-29 15:01:25 +00:00
starkos
05bbfcc15b Added project dependencies to PBXProject 2009-11-29 14:46:33 +00:00
starkos
ac4b428099 Added project dependencies to PBXNativeTarget 2009-11-29 14:39:58 +00:00
starkos
776f833413 Added project dependencies to PBXGroup 2009-11-29 14:24:12 +00:00
starkos
7e5e63d2dd Added project dependencies to PBXFrameworksBuildPhase 2009-11-29 13:36:46 +00:00
starkos
992eec33ab Added project dependency to PBXFileReference 2009-11-28 16:28:25 +00:00
starkos
912ebca665 Implemented PBXContainerItemProxy 2009-11-28 16:13:26 +00:00
starkos
8e3604d95f Attach IDs needed for inter-project dependencies at solution setup time 2009-11-28 16:04:52 +00:00
starkos
f1e5457752 Implemented linkoptions() for Xcode 2009-11-25 20:36:20 +00:00
starkos
73aad5b34b Implemented includedirs() and defines() for Xcode 2009-11-25 20:27:57 +00:00
starkos
293b03daa2 Fixed bug in Xcode group pathing; started work on project dependencies 2009-11-25 19:40:23 +00:00
starkos
b5dd640f9d Fix for product file reference names 2009-11-19 19:44:11 +00:00
starkos
49755b0d23 Feature 2900623: Add targetsuffix and implibsuffix properties 2009-11-19 19:02:43 +00:00
starkos
f47e40abbe Implemented location(), targetdir(), objdir() 2009-11-17 20:30:56 +00:00
starkos
bf152cac6b Cleanup on target and project config blocks 2009-11-10 20:32:20 +00:00
starkos
5ad56cccaa Removed SDKROOT 2009-11-10 19:03:35 +00:00
starkos
eef1a97501 Finished porting 2009-11-09 21:34:46 +00:00
starkos
0273520f02 Ported build configurations 2009-11-09 21:16:34 +00:00
starkos
382aed3e93 Ported PBXSourcesBuildPhase 2009-11-09 20:42:50 +00:00
starkos
bd65dcc2c9 Ported PBXResourcesBuildPhase 2009-11-09 20:39:27 +00:00
starkos
11a4804617 Ported PBXProject 2009-11-09 20:29:42 +00:00
starkos
794b84c90f Ported PBXNativeTarget 2009-11-09 20:26:11 +00:00
starkos
756d5e844a Ported PBXGroup 2009-11-09 20:12:40 +00:00
starkos
8ebddad6b0 Ported PBXFrameworksBuildPhase 2009-11-06 21:39:44 +00:00
starkos
7943baa46f Finished porting PBXFileReference 2009-11-06 21:33:49 +00:00
starkos
5b27a0a368 Began porting PBXFileReference 2009-11-05 21:55:34 +00:00