Changeset 3536

Timestamp:

08/15/08 19:44:44 (4 months ago)

Author:

dgollub

Message:

Patch by yselkowitz:
libopensync assumes that modules have a .so extension. This is not
always correct; on Cygwin, for instance, they have a .dll extension. I'm
attaching a patch for 0.36 that uses G_MODULE_SUFFIX for portability.

Location:

trunk

Files:

• opensync/format/opensync_format_env.c (modified) (1 diff)
• opensync/plugin/opensync_plugin_env.c (modified) (1 diff)
• tests/format-tests/check_format_env.c (modified) (1 diff)
• tests/module-tests/check_module.c (modified) (6 diffs)
• tests/support.c (modified) (1 diff)

trunk/opensync/format/opensync_format_env.c

@@ -72 +72 @@
                 filename = g_strdup_printf ("%s%c%s", path, G_DIR_SEPARATOR, de);
                 
-                if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR) || !g_pattern_match_simple("*.so", filename)) {
+                if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR) || !g_pattern_match_simple("*."G_MODULE_SUFFIX, filename)) {
                         g_free(filename);
                         continue;

trunk/opensync/plugin/opensync_plugin_env.c

@@ -148 +148 @@
                 filename = g_strdup_printf ("%s%c%s", path, G_DIR_SEPARATOR, de);
                 
-                if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR) || !g_pattern_match_simple("*.so", filename)) {
+                if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR) || !g_pattern_match_simple("*."G_MODULE_SUFFIX, filename)) {
                         g_free(filename);
                         continue;

trunk/tests/format-tests/check_format_env.c

@@ -370 +370 @@
         
         char *curdir = g_get_current_dir();
-        char *path = g_strdup_printf("%s/mock-format.so", curdir);
+        char *path = g_strdup_printf("%s/mock-format.%s", curdir, G_MODULE_SUFFIX);
         fail_unless(osync_module_load(module, path, &error), NULL);
         fail_unless(error == NULL, NULL);

trunk/tests/module-tests/check_module.c

@@ -28 +28 @@
         
         char *curdir = g_get_current_dir();
-        char *path = g_strdup_printf("%s/mock-format.so", curdir);
+        char *path = g_strdup_printf("%s/mock-format.%s", curdir, G_MODULE_SUFFIX);
         fail_unless(osync_module_load(module, path, &error), NULL);
         fail_unless(error == NULL, NULL);
@@ -52 +52 @@
         
         char *curdir = g_get_current_dir();
-        char *path = g_strdup_printf("%s/does-not-exist.so", curdir);
+        char *path = g_strdup_printf("%s/does-not-exist.%s", curdir, G_MODULE_SUFFIX);
         fail_unless(!osync_module_load(module, path, &error), NULL);
         fail_unless(error != NULL, NULL);
@@ -75 +75 @@
         
         char *curdir = g_get_current_dir();
-        char *path = g_strdup_printf("%s/mock-format.so", curdir);
+        char *path = g_strdup_printf("%s/mock-format.%s", curdir, G_MODULE_SUFFIX);
         fail_unless(osync_module_load(module, path, &error), NULL);
         fail_unless(error == NULL, NULL);
@@ -103 +103 @@
         
         char *curdir = g_get_current_dir();
-        char *path = g_strdup_printf("%s/mock-format.so", curdir);
+        char *path = g_strdup_printf("%s/mock-format.%s", curdir, G_MODULE_SUFFIX);
         fail_unless(osync_module_load(module, path, &error), NULL);
         fail_unless(error == NULL, NULL);
@@ -132 +132 @@
         
         char *curdir = g_get_current_dir();
-        char *path = g_strdup_printf("%s/mock-format.so", curdir);
+        char *path = g_strdup_printf("%s/mock-format.%s", curdir, G_MODULE_SUFFIX);
         fail_unless(osync_module_load(module, path, &error), NULL);
         fail_unless(error == NULL, NULL);
@@ -159 +159 @@
         
         char *curdir = g_get_current_dir();
-        char *path = g_strdup_printf("%s/mock-format.so", curdir);
+        char *path = g_strdup_printf("%s/mock-format.%s", curdir, G_MODULE_SUFFIX);
         fail_unless(osync_module_load(module, path, &error), NULL);
         fail_unless(error == NULL, NULL);

trunk/tests/support.c

@@ -65 +65 @@
         g_free(command);*/
         
-        command = g_strdup_printf("cp ./mock-plugin/mock-sync.so %s", testbed);
+        command = g_strdup_printf("cp ./mock-plugin/mock-sync.%s %s", G_MODULE_SUFFIX, testbed);
         if (system(command))
                 abort();
         g_free(command);
         
-        command = g_strdup_printf("cp ./mock-plugin/mock-format.so %s", testbed);
+        command = g_strdup_printf("cp ./mock-plugin/mock-format.%s %s", G_MODULE_SUFFIX, testbed);
         if (system(command))
                 abort();
         g_free(command);
         
-        command = g_strdup_printf("cp -R ../formats/*.so %s", testbed);
+        command = g_strdup_printf("cp -R ../formats/*.%s %s", G_MODULE_SUFFIX, testbed);
         if (system(command))
                 abort();