Permalink
Browse files

Merge branch 'master' of github.com:taskjuggler/TaskJuggler

  • Loading branch information...
2 parents a0c03a7 + 2dffd02 commit db759dbe9a45402f764a6075117671d1b761b1a3 @scrapper scrapper committed Dec 31, 2013
Showing with 17 additions and 12 deletions.
  1. +1 −1 bin/tj3
  2. +1 −1 bin/tj3client
  3. +1 −1 bin/tj3d
  4. +1 −1 bin/tj3man
  5. +1 −1 bin/tj3ss_receiver
  6. +1 −1 bin/tj3ss_sender
  7. +1 −1 bin/tj3ts_receiver
  8. +1 −1 bin/tj3ts_sender
  9. +1 −1 bin/tj3ts_summary
  10. +1 −1 bin/tj3webd
  11. +3 −1 lib/taskjuggler/TjpSyntaxRules.rb
  12. +4 −1 lib/taskjuggler/reports/MspXmlRE.rb
View
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
require File.basename(__FILE__)
View
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
require File.basename(__FILE__)
View
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
require File.basename(__FILE__)
View
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
require File.basename(__FILE__)
View
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
require File.basename(__FILE__)
View
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
require File.basename(__FILE__)
View
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
require File.basename(__FILE__)
View
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
require File.basename(__FILE__)
View
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
require File.basename(__FILE__)
View
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
require File.basename(__FILE__)
@@ -1195,7 +1195,9 @@ def rule_exportFormat
Project XML format can represent. This will inevitably lead to some rounding
errors and different interpretation of the data. The numbers you will see in
Project are not necessarily an exact match of the numbers you see in
-TaskJuggler.
+TaskJuggler. The XML file format requires the sequence of the tasks in the
+file to follow the work breakdown structure. Hence all user provided sorting
+directions will be ignored for this format.
EOT
)
end
@@ -53,7 +53,10 @@ def to_mspxml
# Prepare the task list.
@taskList = PropertyList.new(@project.tasks)
@taskList.includeAdopted
- @taskList.setSorting(a('sortTasks'))
+ # The MSP XML format requires that the tasks are listed in 'tree' order.
+ # We purposely ignore the user provided sorting criteria.
+ @taskList.setSorting([ [ 'tree', true, -1 ],
+ [ 'seqno', true, -1 ] ])
@taskList = filterTaskList(@taskList, nil, a('hideTask'), a('rollupTask'),
a('openNodes'))
@taskList.sort!

0 comments on commit db759db

Please sign in to comment.