dep-selector-libgecode 1.0.0.alpha.1 → 1.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3731b6b1fca5ee9be71f1290a6ca7e80334881fe
-  data.tar.gz: 0ebf347f37bf6244bb10e00c7ad91fdc1f38225c
+  metadata.gz: f45b103597f32988c91cbc2db8564d16c52345fd
+  data.tar.gz: d15a3547e6b6528a3183463376841c485c022008
 SHA512:
-  metadata.gz: f611185842ea091b41f1467293336ed0eb53b2b499eb6cd7a51ad3acd3a09af499b3fd4c7f8553661b9158487bc48f1f65dda9a64771d4eefdba82edff27e4d6
-  data.tar.gz: 8d7f0c6774110ef695b39541f7e949219a6da5405c7116602d36d24c87128dfe94fba204f879f71d42067604a949bdc34793ab659f963f0f73cd780ff4791727
+  metadata.gz: 9a10243cb0e96ed35ecf97a498cc4f245dc7731361ac8d626a6ae9ffa60243a84dc693ae6bc76d620715e0edd9bf1befb0853512bcf84ac9f2218f432c78c4da
+  data.tar.gz: 54df34e4fe632f17cc849a01970dcdaf10bc3193c6286658262012e03c12a65addf2574cd15c916ee4180eb0937b29c9997192aa70f576458a0ec938cb31884f

data/ext/libgecode3/extconf.rb

@@ -1,3 +1,5 @@
+exit(0) if ENV["USE_SYSTEM_GECODE"]
+
 require 'pp'
 
 module GecodeBuild
@@ -7,20 +9,26 @@ module GecodeBuild
 
   PREFIX = File.expand_path("../../../lib/dep-selector-libgecode/vendored-gecode", __FILE__).freeze
 
-  LOG_FILE_PATH = File.expand_path("../gecode_build.log", __FILE__)
+  def self.windows?
+   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+  end
 
   def self.gecode_vendor_dir
     GECODE_VENDOR_DIR
   end
 
+  def self.configure
+    File.join(GECODE_VENDOR_DIR, "configure")
+  end
+
   def self.prefix
     PREFIX
   end
 
-  # TODO: this needs to detect windows and add `--with-host-os=windows`
   def self.configure_cmd
-    %W[
-      ./configure
+    args = %W[
+      sh
+      #{configure}
       --prefix=#{prefix}
       --disable-doc-dot
       --disable-doc-search
@@ -31,14 +39,24 @@ module GecodeBuild
       --disable-examples
       --disable-flatzinc
     ]
+    args << "--with-host-os=windows" if windows?
+    args
+  end
+
+  def self.setup_env
+    if windows?
+      ENV['CC'] = 'gcc'
+      ENV['CXX'] = 'g++'
+    end
   end
 
   def self.system(*args)
     print("-> #{args.join(' ')}\n")
-    super(*args, [:out, :err] => [LOG_FILE_PATH, "w"])
+    super(*args)
   end
 
   def self.run_build_commands
+    setup_env
     system(*configure_cmd) &&
       system("make", "clean") &&
       system("make", "-j", "5") &&
@@ -47,11 +65,10 @@ module GecodeBuild
 
   def self.run
     Dir.chdir(gecode_vendor_dir) do
-      run_build_commands or raise BuildError, "Failed to build gecode library. See log for details: #{LOG_FILE_PATH}"
+      run_build_commands or raise BuildError, "Failed to build gecode library."
     end
   end
 
 end
 
 GecodeBuild.run
-

data/ext/libgecode3/vendor/gecode-3.7.3/gecode/flatzinc/lexer.yy.cpp

@@ -54,7 +54,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -85,6 +84,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -158,7 +159,15 @@ typedef void* yyscan_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -599,8 +608,8 @@ static yyconst flex_int32_t yy_rule_can_match_eol[57] =
  *     Guido Tack, 2007
  *
  *  Last modified:
- *     $Date: 2012-03-21 16:25:08 +1100 (Wed, 21 Mar 2012) $ by $Author: tack $
- *     $Revision: 12605 $
+ *     $Date: 2006-12-11 03:27:31 +1100 (Mon, 11 Dec 2006) $ by $Author: schulte $
+ *     $Revision: 4024 $
  *
  *  This file is part of Gecode, the generic constraint
  *  development environment:
@@ -647,7 +656,7 @@ int stringbufpos;
 int yy_input_proc(char* buf, int size, yyscan_t yyscanner);
 #define YY_INPUT(buf, result, max_size) \
   result = yy_input_proc(buf, max_size, yyscanner);
-#line 651 "gecode/flatzinc/lexer.yy.cpp"
+#line 660 "gecode/flatzinc/lexer.yy.cpp"
 
 #define INITIAL 0
 
@@ -776,7 +785,12 @@ static int input (yyscan_t yyscanner );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -784,7 +798,7 @@ static int input (yyscan_t yyscanner );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -795,7 +809,7 @@ static int input (yyscan_t yyscanner );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		yy_size_t n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -883,7 +897,7 @@ YY_DECL
 #line 66 "./gecode/flatzinc/lexer.lxx"
 
 
-#line 887 "gecode/flatzinc/lexer.yy.cpp"
+#line 901 "gecode/flatzinc/lexer.yy.cpp"
 
     yylval = yylval_param;
 
@@ -959,7 +973,7 @@ yy_find_action:
 
 		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
-			yy_size_t yyl;
+			int yyl;
 			for ( yyl = 0; yyl < yyleng; ++yyl )
 				if ( yytext[yyl] == '\n' )
 					   
@@ -1267,7 +1281,7 @@ YY_RULE_SETUP
 #line 130 "./gecode/flatzinc/lexer.lxx"
 ECHO;
 	YY_BREAK
-#line 1271 "gecode/flatzinc/lexer.yy.cpp"
+#line 1285 "gecode/flatzinc/lexer.yy.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2050,8 +2064,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * @param yyscanner The scanner object.
  * @return the newly allocated buffer state object.
  */