Permalink
Browse files

Add AvoidUnusedInternalResourceRule in makefile and fix resx for linu…

…x (path)
  • Loading branch information...
1 parent f171ffd commit 31fa6252df33dc408ce89f7da018bad5bd3e4621 Antoine committed with Sebastien Pouliot Jan 5, 2011
@@ -2,11 +2,12 @@ include ../common.make
common_tests=../Test.Rules/Test.Rules.dll,System.Drawing
rules_sources = \
+ AvoidUnusedInternalResourceRule.cs \
SatelliteResourceMismatchRule.cs
-EXTRA_TESTS_OPTIONS += -d:DEBUG -resource:Test/Resource.resources -resource:Test/Resources/XMLFileNotInResX.xml
+EXTRA_TESTS_OPTIONS += -d:DEBUG -resource:Test/Resource.resources -resource:Test/InternalResource.resources -resource:Test/PublicResource.resources -resource:Test/Resources/XMLFileNotInResX.xml
-EXTRA_DIST += Test/Resource.resx Test/Resource.fr.resx Test/MainResourceMissing.fr.resx
+EXTRA_DIST += Test/Resource.resx Test/Resource.fr.resx Test/MainResourceMissing.fr.resx Test/InternalResource.resx Test/PublicResource.resx
tests_resource_resx = Test/Resource.resx
tests_resource_prefix_resx = $(addprefix $(srcdir)/, $(tests_resource_resx))
@@ -26,15 +27,30 @@ tests_resource_missing_prefix_resx_fr = $(addprefix $(srcdir)/, $(tests_resource
Test/MainResourceMissing.fr.resources: $(tests_resource_missing_resx_fr)
resgen2 -usesourcepath -compile $(tests_resource_missing_resx_fr),Test/MainResourceMissing.fr.resources;
+tests_internalresource_resx = Test/InternalResource.resx
+tests_internalresource_prefix_resx = $(addprefix $(srcdir)/, $(tests_internalresource_resx))
+
+Test/InternalResource.resources: $(tests_internalresource_resx)
+ resgen2 -usesourcepath -compile $(tests_internalresource_resx),Test/InternalResource.resources;
+
+tests_publicresource_resx = Test/PublicResource.resx
+tests_publicresource_prefix_resx = $(addprefix $(srcdir)/, $(tests_publicresource_resx))
+
+Test/PublicResource.resources: $(tests_publicresource_resx)
+ resgen2 -usesourcepath -compile $(tests_publicresource_resx),Test/PublicResource.resources;
+
tests_resource_xmlnotresx_fr = Test/Resources/XMLFileNotInResX.fr.xml
tests_resource_missing_xmlnotresx_fr = Test/Resources/XMLFileNotInResXOnlyInFrench.fr.xml
fr/Test.Rules.Globalization.resources.dll: Test/Resource.fr.resources Test/MainResourceMissing.fr.resources $(tests_resource_xmlnotresx_fr) $(tests_resource_missing_xmlnotresx_fr)
mkdir -p fr
al -culture:fr -embed:Test/MainResourceMissing.fr.resources -embed:Test/Resource.fr.resources -embed:$(tests_resource_xmlnotresx_fr) -embed:$(tests_resource_missing_xmlnotresx_fr) -out:fr/Test.Rules.Globalization.resources.dll
-EXTRA_TESTS_DEPS = Test/Resource.resources Test/Resources/XMLFileNotInResX.xml fr/Test.Rules.Globalization.resources.dll
+EXTRA_TESTS_DEPS = Test/Resource.resources Test/InternalResource.resources Test/PublicResource.resources Test/Resources/XMLFileNotInResX.xml fr/Test.Rules.Globalization.resources.dll
tests_sources = \
+ AvoidUnusedInternalResourceTest.cs \
SatelliteResourceMismatchTest.cs \
- Resource.Designer.cs
+ Resource.Designer.cs \
+ InternalResource.Designer.cs \
+ PublicResource.Designer.cs
@@ -122,10 +122,10 @@
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ImageUnused" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\ImageUnused.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>Resources/ImageUnused.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ImageUsed" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\ImageUsed.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>Resources/ImageUsed.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UncalledString" xml:space="preserve">
<value>Uncalled</value>

0 comments on commit 31fa625

Please sign in to comment.