Build will use per-profile source lists

svn path=/trunk/mcs/; revision=135355

diff --git a/mcs/class/Mono.Data.Sqlite/Makefile b/mcs/class/Mono.Data.Sqlite/Makefile
index 3c11931c08e2f693fe949fed8034683eeab6ad27..582678fa8c965cee50e4fa83ebde93f25c3a1e04 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/Makefile
+++ b/mcs/class/Mono.Data.Sqlite/Makefile
@@ -6,13 +6,14 @@ ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 OTHER_LIB_MCS_FLAGS = /r:System.Transactions.dll
 
 RESX_RESOURCES = resources/SR.resources
+OTHER_RESOURCES = $(wildcard resources/*.bmp)
 
-RESOURCES = $(RESX_RESOURCES)
+RESOURCES = $(RESX_RESOURCES) $(OTHER_RESOURCES)
 endif
 
 LIBRARY = Mono.Data.Sqlite.dll
 LIB_MCS_FLAGS = /unsafe /r:System.dll /r:System.Data.dll $(OTHER_LIB_MCS_FLAGS) \
-       $(RESX_RESOURCES:%=-resource:%) -d:MONO_BACKWARD_COMPAT
+       $(RESOURCES:%=-resource:%) -d:SQLITE_STANDARD
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618
 
@@ -21,7 +22,8 @@ EXTRA_DISTFILES = Test/SqliteTest.cs \
        resources/SR.resx       \
        resources/ChangeLog     \
        resources/DataTypes.xml \
-       resources/MetaDataCollections.xml
+       resources/MetaDataCollections.xml \
+       $(wildcard resources/*.bmp)
 
 run-test-local: test.db 
 
@@ -30,7 +32,7 @@ test.db: Test/test.sql
        sqlite3 $@ < $< || :
 
 include ../../build/library.make
-ifeq (net_2_0, $(PROFILE))
+ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
 $(the_lib): $(RESOURCES)
 
 $(RESX_RESOURCES): %.resources: %.resx

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.dll.sources b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.dll.sources
deleted file mode 100644 (file)
index d6cbf9d..0000000
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.dll.sources
+++ /dev/null
@@ -1,40 +0,0 @@
-Assembly/AssemblyInfo.cs
-../../build/common/Consts.cs
-../../build/common/Locale.cs
-../../build/common/MonoTODOAttribute.cs
-Mono.Data.Sqlite/SqliteCommand.cs
-Mono.Data.Sqlite/SqliteConnection.cs
-Mono.Data.Sqlite/Sqlite.cs
-Mono.Data.Sqlite/SqliteDataAdapter.cs
-Mono.Data.Sqlite/SqliteDataReader.cs
-Mono.Data.Sqlite/SqliteExceptions.cs
-Mono.Data.Sqlite/SqliteParameterCollection.cs
-Mono.Data.Sqlite/SqliteParameter.cs
-Mono.Data.Sqlite/SqliteRowUpdatedEventArgs.cs
-Mono.Data.Sqlite/SqliteRowUpdatedEventHandler.cs
-Mono.Data.Sqlite/SqliteRowUpdatingEventArgs.cs
-Mono.Data.Sqlite/SqliteRowUpdatingEventHandler.cs
-Mono.Data.Sqlite/SqliteTransaction.cs
-Mono.Data.Sqlite_2.0/SQLite3.cs
-Mono.Data.Sqlite_2.0/SQLite3_UTF16.cs
-Mono.Data.Sqlite_2.0/SQLiteBase.cs
-Mono.Data.Sqlite_2.0/SQLiteCommandBuilder.cs
-Mono.Data.Sqlite_2.0/SQLiteCommand.cs
-Mono.Data.Sqlite_2.0/SQLiteConnection.cs
-Mono.Data.Sqlite_2.0/SQLiteConnectionStringBuilder.cs
-Mono.Data.Sqlite_2.0/SQLiteConvert.cs
-Mono.Data.Sqlite_2.0/SQLiteDataAdapter.cs
-Mono.Data.Sqlite_2.0/SQLiteDataReader.cs
-Mono.Data.Sqlite_2.0/SqliteDataSourceEnumerator.cs
-Mono.Data.Sqlite_2.0/SQLiteEnlistment.cs
-Mono.Data.Sqlite_2.0/SQLiteException.cs
-Mono.Data.Sqlite_2.0/SQLiteFactory.cs
-Mono.Data.Sqlite_2.0/SQLiteFunctionAttribute.cs
-Mono.Data.Sqlite_2.0/SQLiteFunction.cs
-Mono.Data.Sqlite_2.0/SQLiteMetaDataCollectionNames.cs
-Mono.Data.Sqlite_2.0/SQLiteParameterCollection.cs
-Mono.Data.Sqlite_2.0/SQLiteParameter.cs
-Mono.Data.Sqlite_2.0/SQLiteStatement.cs
-Mono.Data.Sqlite_2.0/SQLiteTransaction.cs
-Mono.Data.Sqlite_2.0/SR.Designer.cs
-Mono.Data.Sqlite_2.0/UnsafeNativeMethods.cs

diff --git a/mcs/class/Mono.Data.Sqlite/net_1_1_Mono.Data.Sqlite.dll.sources b/mcs/class/Mono.Data.Sqlite/net_1_1_Mono.Data.Sqlite.dll.sources
new file mode 100644 (file)
index 0000000..1c03178
--- /dev/null
+++ b/mcs/class/Mono.Data.Sqlite/net_1_1_Mono.Data.Sqlite.dll.sources
@@ -0,0 +1,17 @@
+Assembly/AssemblyInfo_1.1.cs
+../../build/common/Consts.cs
+../../build/common/Locale.cs
+../../build/common/MonoTODOAttribute.cs
+Mono.Data.Sqlite/SqliteCommand.cs
+Mono.Data.Sqlite/SqliteConnection.cs
+Mono.Data.Sqlite/Sqlite.cs
+Mono.Data.Sqlite/SqliteDataAdapter.cs
+Mono.Data.Sqlite/SqliteDataReader.cs
+Mono.Data.Sqlite/SqliteExceptions.cs
+Mono.Data.Sqlite/SqliteParameterCollection.cs
+Mono.Data.Sqlite/SqliteParameter.cs
+Mono.Data.Sqlite/SqliteRowUpdatedEventArgs.cs
+Mono.Data.Sqlite/SqliteRowUpdatedEventHandler.cs
+Mono.Data.Sqlite/SqliteRowUpdatingEventArgs.cs
+Mono.Data.Sqlite/SqliteRowUpdatingEventHandler.cs
+Mono.Data.Sqlite/SqliteTransaction.cs

diff --git a/mcs/class/Mono.Data.Sqlite/net_2_0_Mono.Data.Sqlite.dll.sources b/mcs/class/Mono.Data.Sqlite/net_2_0_Mono.Data.Sqlite.dll.sources
new file mode 100644 (file)
index 0000000..7ee134b
--- /dev/null
+++ b/mcs/class/Mono.Data.Sqlite/net_2_0_Mono.Data.Sqlite.dll.sources
@@ -0,0 +1,31 @@
+Assembly/AssemblyInfo.cs
+../../build/common/Consts.cs
+../../build/common/Locale.cs
+../../build/common/MonoTODOAttribute.cs
+Mono.Data.Sqlite_2.0/SQLite3.cs
+Mono.Data.Sqlite_2.0/SQLite3_UTF16.cs
+Mono.Data.Sqlite_2.0/SQLiteBase.cs
+Mono.Data.Sqlite_2.0/SQLiteCommandBuilder.cs
+Mono.Data.Sqlite_2.0/SQLiteCommand.cs
+Mono.Data.Sqlite_2.0/SQLiteConnection.cs
+Mono.Data.Sqlite_2.0/LINQ/SQLiteConnection_Linq.cs
+Mono.Data.Sqlite_2.0/SQLiteConnectionPool.cs
+Mono.Data.Sqlite_2.0/SQLiteConnectionStringBuilder.cs
+Mono.Data.Sqlite_2.0/SQLiteConvert.cs
+Mono.Data.Sqlite_2.0/SQLiteDataAdapter.cs
+Mono.Data.Sqlite_2.0/SQLiteDataReader.cs
+Mono.Data.Sqlite_2.0/SqliteDataSourceEnumerator.cs
+Mono.Data.Sqlite_2.0/SQLiteEnlistment.cs
+Mono.Data.Sqlite_2.0/SQLiteException.cs
+Mono.Data.Sqlite_2.0/SQLiteFactory.cs
+Mono.Data.Sqlite_2.0/LINQ/SQLiteFactory_Linq.cs
+Mono.Data.Sqlite_2.0/SQLiteFunctionAttribute.cs
+Mono.Data.Sqlite_2.0/SQLiteFunction.cs
+Mono.Data.Sqlite_2.0/SQLiteKeyReader.cs
+Mono.Data.Sqlite_2.0/SQLiteMetaDataCollectionNames.cs
+Mono.Data.Sqlite_2.0/SQLiteParameterCollection.cs
+Mono.Data.Sqlite_2.0/SQLiteParameter.cs
+Mono.Data.Sqlite_2.0/SQLiteStatement.cs
+Mono.Data.Sqlite_2.0/SQLiteTransaction.cs
+Mono.Data.Sqlite_2.0/SR.Designer.cs
+Mono.Data.Sqlite_2.0/UnsafeNativeMethods.cs