Author: matt
Date: 2011-08-15 14:19:33 -0700 (Mon, 15 Aug 2011)
New Revision: 8975
Log:
'inactive' test was not using its .fl file
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/ide/VisualC2008/inactive.vcproj
branches/branch-3.0/ide/VisualC2010/inactive.vcxproj
branches/branch-3.0/ide/VisualC6/inactive.dsp
branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-08-15 21:12:35 UTC (rev 8974)
+++ branches/branch-3.0/fltk.flw 2011-08-15 21:19:33 UTC (rev 8975)
@@ -4872,10 +4872,10 @@
uuid_VC2010_Project {25CC5BF0-9190-4363-A601-D8A2DE05128A}
target_path test
} {
- file_ref {inactive.cxx} {
- uuid_Xcode4_BuildFileInSources {AD6A5D71-1457-430E-A390-7D2BE26DFED3}
- uuid_Xcode4_FileRef {6E7B3E1A-5C29-4348-B81E-DCC044198702}
- filename_and_path {test/inactive.cxx}
+ file_ref {inactive.fl} {
+ uuid_Xcode4_BuildFileInSources {73B44703-F5D9-468A-9DC3-8250E624F2AB}
+ uuid_Xcode4_FileRef {295B1BF3-4466-4FF5-9D8E-469FF38E280E}
+ filename_and_path {test/inactive.fl}
}
target_dependency fltk {
uuid_Xcode4_BuildFileInFrameworks
{7B867E21-4AD4-4F74-B856-AB2397745EB7}
Modified: branches/branch-3.0/ide/VisualC2008/inactive.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/inactive.vcproj 2011-08-15 21:12:35 UTC
(rev 8974)
+++ branches/branch-3.0/ide/VisualC2008/inactive.vcproj 2011-08-15 21:19:33 UTC
(rev 8975)
@@ -222,6 +222,30 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath="..\..\test\inactive.fl"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Create .cxx and .h file
with fluidd"
+ CommandLine="cfluid /D
$(InputName).fl
"
+ Outputs="..\..\test\\$(InputName).cxx"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Create .cxx and .h file
with fluid"
+ CommandLine="cfluid
$(InputName).fl
"
+ Outputs="..\..\test\\$(InputName).cxx"
+ />
+ </FileConfiguration>
+ </File>
</Files>
<Globals>
</Globals>
Modified: branches/branch-3.0/ide/VisualC2010/inactive.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/inactive.vcxproj 2011-08-15
21:12:35 UTC (rev 8974)
+++ branches/branch-3.0/ide/VisualC2010/inactive.vcxproj 2011-08-15
21:19:33 UTC (rev 8975)
@@ -137,6 +137,18 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <CustomBuild Include="..\..\test\inactive.fl">
+ <Message
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create .cxx and .h
file with fluidd</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cfluid /D
%(Filename).fl
+ </Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\test\\%(Filename).cxx;%(Outputs)</Outputs>
+ <Message
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create .cxx and .h
file with fluid</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cfluid
%(Filename).fl
+ </Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\test\\%(Filename).cxx;%(Outputs)</Outputs>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
<ProjectReference Include="fltk.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: branches/branch-3.0/ide/VisualC6/inactive.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/inactive.dsp 2011-08-15 21:12:35 UTC
(rev 8974)
+++ branches/branch-3.0/ide/VisualC6/inactive.dsp 2011-08-15 21:19:33 UTC
(rev 8975)
@@ -93,5 +93,36 @@
SOURCE=..\..\test\inactive.cxx
# End Source File
+# Begin Source File
+
+SOURCE=..\..\test\inactive.fl
+
+!IF "$(CFG)" == "inactive - Win32 Release"
+
+# Begin Custom Build - Create .cxx and .h file with fluid
+InputPath=..\..\test\inactive.fl
+
+"..\..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ pushd ..\..\test\
+ ..\fluid\fluid -c inactive.fl
+ popd
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "inactive - Win32 Debug"
+
+# Begin Custom Build - Create .cxx and .h file with fluidd
+InputPath=..\..\test\inactive.fl
+
+"..\..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ pushd ..\..\test\
+ ..\fluid\fluidd -c inactive.fl
+ popd
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
# End Target
# End Project
Modified: branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2011-08-15 21:12:35 UTC (rev 8974)
+++ branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2011-08-15 21:19:33 UTC (rev 8975)
@@ -607,7 +607,7 @@
20F0A0AB1E01B61DE96ACF87 /* image.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = 04420ABF2C9A76ADD540BFB3 /* image.cxx */; };
C328C1462C1BC9F72437B45B /* fltk.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk.framework */; };
75CC268F72D04A692FF84F90 /* fltk.framework in CopyFiles */ =
{isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk.framework */; };
- AD6A5D715759DEBBE26DFED3 /* inactive.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = 6E7B3E1A1F6164DE44198702 /* inactive.cxx */; };
+ 73B44703B3531F93E624F2AB /* inactive.fl in Sources */ = {isa =
PBXBuildFile; fileRef = 295B1BF30B93DB11F38E280E /* inactive.fl */; };
7B867E2105A0137597745EB7 /* fltk.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk.framework */; };
F84B19DFE34CAA14F9BE1497 /* fltk.framework in CopyFiles */ =
{isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk.framework */; };
CDFD6D222115D70A09272409 /* input.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = DBE8F57CF32E554D590FF812 /* input.cxx */; };
@@ -4272,7 +4272,7 @@
485FE757F7E72AE85A0A748C /* iconize.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = iconize.app; sourceTree = BUILT_PRODUCTS_DIR; };
04420ABF2C9A76ADD540BFB3 /* image.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = image.cxx; path = ../../test/image.cxx; sourceTree = SOURCE_ROOT; };
B762D2EC97F863F0C20D54F8 /* image.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = image.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 6E7B3E1A1F6164DE44198702 /* inactive.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = inactive.cxx; path = ../../test/inactive.cxx; sourceTree = SOURCE_ROOT;
};
+ 295B1BF30B93DB11F38E280E /* inactive.fl */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name =
inactive.fl; path = ../../test/inactive.fl; sourceTree = SOURCE_ROOT; };
0FE867409A9EE6783883AC59 /* inactive.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = inactive.app; sourceTree = BUILT_PRODUCTS_DIR; };
DBE8F57CF32E554D590FF812 /* input.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = input.cxx; path = ../../test/input.cxx; sourceTree = SOURCE_ROOT; };
65DD819C4812FFA694D297E7 /* input.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = input.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -6034,7 +6034,7 @@
4C05078A12EF52B88763A3EA /* inactive */ = {
isa = PBXGroup;
children = (
- 6E7B3E1A1F6164DE44198702 /* inactive.cxx */,
+ 295B1BF30B93DB11F38E280E /* inactive.fl */,
);
name = inactive;
sourceTree = "<group>";
@@ -9467,7 +9467,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- AD6A5D715759DEBBE26DFED3 /* inactive.cxx in
Sources */,
+ 73B44703B3531F93E624F2AB /* inactive.fl in
Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
