updated most things to work on Wheezy
I haven't done the new opencv packages yet, so I just didn't test
compiling that stuff.
Almost all of the changes were related to user-defined string literals
breaking things like "%"PRIu32" (in our code and other people's).
diff --git a/aos/build/queues/objects/queue.rb b/aos/build/queues/objects/queue.rb
index 5693486..e993eb9 100644
--- a/aos/build/queues/objects/queue.rb
+++ b/aos/build/queues/objects/queue.rb
@@ -38,14 +38,14 @@
"float" => "%f",
"char" => "%c",
"double" => "%f",
- "uint8_t" => "%\"PRIu8\"",
- "uint16_t" => "%\"PRIu16\"",
- "uint32_t" => "%\"PRIu32\"",
- "uint64_t" => "%\"PRIu64\"",
- "int8_t" => "%\"PRId8\"",
- "int16_t" => "%\"PRId16\"",
- "int32_t" => "%\"PRId32\"",
- "int64_t" => "%\"PRId64\""}
+ "uint8_t" => "%\" PRIu8 \"",
+ "uint16_t" => "%\" PRIu16 \"",
+ "uint32_t" => "%\" PRIu32 \"",
+ "uint64_t" => "%\" PRIu64 \"",
+ "int8_t" => "%\" PRId8 \"",
+ "int16_t" => "%\" PRId16 \"",
+ "int32_t" => "%\" PRId32 \"",
+ "int64_t" => "%\" PRId64 \""}
def toPrintFormat()
if(format = PrintFormat[@type])
return format;
diff --git a/aos/build/queues/output/message_dec.rb b/aos/build/queues/output/message_dec.rb
index 0e957be..a643392 100644
--- a/aos/build/queues/output/message_dec.rb
+++ b/aos/build/queues/output/message_dec.rb
@@ -1,4 +1,9 @@
-require "sha1"
+begin
+ require "sha1"
+rescue LoadError
+ require "digest/sha1"
+end
+
class Target::MessageDec < Target::Node
attr_accessor :name,:loc,:parent,:msg_hash
def initialize(name)
@@ -118,7 +123,7 @@
ts = (@members.collect { |elem|
elem.type + " " + elem.name
}).join(";")
- self.msg_hash = "0x#{SHA1.hexdigest(ts)[-8..-1]}"
+ self.msg_hash = "0x#{Digest::SHA1.hexdigest(ts)[-8..-1]}"
type_class.add_member("enum {kQueueLength = 1234, kHash = #{self.msg_hash}}")
@members.each do |elem|
type_class.add_member(elem.create_usage(cpp_tree))
diff --git a/aos/build/queues/output/q_file.rb b/aos/build/queues/output/q_file.rb
index af76ee1..5e016c0 100644
--- a/aos/build/queues/output/q_file.rb
+++ b/aos/build/queues/output/q_file.rb
@@ -1,4 +1,9 @@
-require "sha1"
+begin
+ require "sha1"
+rescue LoadError
+ require "digest/sha1"
+end
+
module Target
end
class Target::Node
@@ -76,7 +81,7 @@
ts = (@queues.collect { |queue|
queue.msg_hash()
}).join("") + name
- return "0x#{SHA1.hexdigest(ts)[-8..-1]}"
+ return "0x#{Digest::SHA1.hexdigest(ts)[-8..-1]}"
end
def create(cpp_tree)
return if(@extern)