Fixes for building Linux and Mac server externals

livecodefraser · livecodefraser · commit f95b597c36e1 · 2015-04-27T12:05:29.000+01:00
diff --git a/config/linux.gypi b/config/linux.gypi
@@ -42,7 +42,7 @@
 		'target_conditions':
 		[
 			[
-				'_type == "loadable_module" or (_type == "static_library" and library_for_module != 0)',
+				'_type == "loadable_module" or _type == "shared_library" or (_type == "static_library" and library_for_module != 0)',
 				{
 					'cflags':
 					[
@@ -66,6 +66,7 @@
 				{
 					'defines':
 					[
+						'_LINUX',
 						'_SERVER',
 						'_LINUX_SERVER',
 					],
diff --git a/config/mac.gypi b/config/mac.gypi
@@ -29,6 +29,8 @@
 	
 	'target_defaults':
 	{
+		'mac_bundle': 0,
+		
 		'variables':
 		{
 			'app_bundle_suffix': '.app',
@@ -59,6 +61,13 @@
 					],
 				},
 			],
+			[
+				# Non-bundle loadable module should have a .dylib suffix
+				'_type == "loadable_module" and _mac_bundle == 0',
+				{
+					'product_extension': 'dylib',
+				},
+			],
 		],
 		
 		'configurations':
diff --git a/livecode.gyp b/livecode.gyp
@@ -64,6 +64,8 @@
 							'revdb/revdb.gyp:dbodbc-server',
 							'revdb/revdb.gyp:dbpostgresql-server',
 							'revdb/revdb.gyp:dbsqlite-server',
+							'revxml/revxml.gyp:revxml-server',
+							'revzip/revzip.gyp:revzip-server',
 						],
 					},
 				],
diff --git a/revdb/revdb.gyp b/revdb/revdb.gyp
@@ -120,7 +120,7 @@
 		},
 		{
 			'target_name': 'dbmysql-server',
-			'type': 'shared_library',
+			'type': 'loadable_module',
 			'product_prefix': '',
 			'product_name': 'server-dbmysql',
 			
@@ -233,7 +233,7 @@
 		},
 		{
 			'target_name': 'dbodbc-server',
-			'type': 'shared_library',
+			'type': 'loadable_module',
 			'product_prefix': '',
 			'product_name': 'server-dbodbc',
 			
@@ -344,7 +344,7 @@
 		},
 		{
 			'target_name': 'dbpostgresql-server',
-			'type': 'shared_library',
+			'type': 'loadable_module',
 			'product_prefix': '',
 			'product_name': 'server-dbpostgresql',
 			
@@ -458,7 +458,7 @@
 		},
 		{
 			'target_name': 'dbsqlite-server',
-			'type': 'shared_library',
+			'type': 'loadable_module',
 			'product_prefix': '',
 			'product_name': 'server-dbsqlite',
 			
@@ -567,7 +567,7 @@
 		},
 		{
 			'target_name': 'revdb-server',
-			'type': 'shared_library',
+			'type': 'loadable_module',
 			'product_prefix': '',
 			'product_name': 'server-revdb',
 			
diff --git a/revxml/revxml.gyp b/revxml/revxml.gyp
@@ -65,7 +65,7 @@
 		},
 		{
 			'target_name': 'revxml-server',
-			'type': 'shared_library',
+			'type': 'loadable_module',
 			'product_prefix': '',
 			'product_name': 'server-revxml',
 			
diff --git a/revzip/revzip.gyp b/revzip/revzip.gyp
@@ -65,7 +65,7 @@
 		},
 		{
 			'target_name': 'revzip-server',
-			'type': 'shared_library',
+			'type': 'loadable_module',
 			'product_prefix': '',
 			'product_name': 'server-revzip',
 			

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`'target_conditions':`
`43`	`43`	`[`
`44`	`44`	`[`
`45`		`- '_type == "loadable_module" or (_type == "static_library" and library_for_module != 0)',`
	`45`	`+ '_type == "loadable_module" or _type == "shared_library" or (_type == "static_library" and library_for_module != 0)',`
`46`	`46`	`{`
`47`	`47`	`'cflags':`
`48`	`48`	`[`
`@@ -66,6 +66,7 @@`
`66`	`66`	`{`
`67`	`67`	`'defines':`
`68`	`68`	`[`
	`69`	`+ '_LINUX',`
`69`	`70`	`'_SERVER',`
`70`	`71`	`'_LINUX_SERVER',`
`71`	`72`	`],`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`},`
`66`	`66`	`{`
`67`	`67`	`'target_name': 'revxml-server',`
`68`		`- 'type': 'shared_library',`
	`68`	`+ 'type': 'loadable_module',`
`69`	`69`	`'product_prefix': '',`
`70`	`70`	`'product_name': 'server-revxml',`
`71`	`71`