diff options
Stage 2: GridServices build files should be fixed now, Someone will need to test it under nant, and the releng scripts might need updating as we now have two solutions.
Also the build order for the two solutions should be to compile the OpenSim Solution first and then the GridServices one, as the common projects are referenced by DLL in the Gridservices.
Diffstat (limited to '')
-rw-r--r-- | prebuild.xml | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/prebuild.xml b/prebuild.xml index 41ded03..98ef888 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -132,7 +132,7 @@ | |||
132 | </Configuration> | 132 | </Configuration> |
133 | <Configuration name="Release"> | 133 | <Configuration name="Release"> |
134 | <Options> | 134 | <Options> |
135 | <OutputPath>../../bin/</OutputPath> | 135 | <OutputPath>../../../bin/</OutputPath> |
136 | </Options> | 136 | </Options> |
137 | </Configuration> | 137 | </Configuration> |
138 | 138 | ||
@@ -513,19 +513,19 @@ | |||
513 | 513 | ||
514 | 514 | ||
515 | <!-- OpenGrid Data Services --> | 515 | <!-- OpenGrid Data Services --> |
516 | <Project name="OpenGrid.Framework.Data" path="OpenGrid.Framework.Data" type="Library"> | 516 | <Project name="OpenGrid.Framework.Data" path="OpenGridServices/OpenGrid.Framework.Data" type="Library"> |
517 | <Configuration name="Debug"> | 517 | <Configuration name="Debug"> |
518 | <Options> | 518 | <Options> |
519 | <OutputPath>../bin/</OutputPath> | 519 | <OutputPath>../../bin/</OutputPath> |
520 | </Options> | 520 | </Options> |
521 | </Configuration> | 521 | </Configuration> |
522 | <Configuration name="Release"> | 522 | <Configuration name="Release"> |
523 | <Options> | 523 | <Options> |
524 | <OutputPath>../bin/</OutputPath> | 524 | <OutputPath>../../bin/</OutputPath> |
525 | </Options> | 525 | </Options> |
526 | </Configuration> | 526 | </Configuration> |
527 | 527 | ||
528 | <ReferencePath>../bin/</ReferencePath> | 528 | <ReferencePath>../../bin/</ReferencePath> |
529 | <Reference name="System" localCopy="false"/> | 529 | <Reference name="System" localCopy="false"/> |
530 | <Reference name="System.Xml"/> | 530 | <Reference name="System.Xml"/> |
531 | <Reference name="System.Data"/> | 531 | <Reference name="System.Data"/> |
@@ -535,19 +535,19 @@ | |||
535 | </Files> | 535 | </Files> |
536 | </Project> | 536 | </Project> |
537 | 537 | ||
538 | <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGrid.Framework.Data.MySQL" type="Library"> | 538 | <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGridServices/OpenGrid.Framework.Data.MySQL" type="Library"> |
539 | <Configuration name="Debug"> | 539 | <Configuration name="Debug"> |
540 | <Options> | 540 | <Options> |
541 | <OutputPath>../bin/</OutputPath> | 541 | <OutputPath>../../bin/</OutputPath> |
542 | </Options> | 542 | </Options> |
543 | </Configuration> | 543 | </Configuration> |
544 | <Configuration name="Release"> | 544 | <Configuration name="Release"> |
545 | <Options> | 545 | <Options> |
546 | <OutputPath>../bin/</OutputPath> | 546 | <OutputPath>../../bin/</OutputPath> |
547 | </Options> | 547 | </Options> |
548 | </Configuration> | 548 | </Configuration> |
549 | 549 | ||
550 | <ReferencePath>../bin/</ReferencePath> | 550 | <ReferencePath>../../bin/</ReferencePath> |
551 | <Reference name="System" localCopy="false"/> | 551 | <Reference name="System" localCopy="false"/> |
552 | <Reference name="System.Xml"/> | 552 | <Reference name="System.Xml"/> |
553 | <Reference name="System.Data"/> | 553 | <Reference name="System.Data"/> |
@@ -559,19 +559,19 @@ | |||
559 | </Files> | 559 | </Files> |
560 | </Project> | 560 | </Project> |
561 | 561 | ||
562 | <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGrid.Framework.Data.DB4o" type="Library"> | 562 | <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGridServices/OpenGrid.Framework.Data.DB4o" type="Library"> |
563 | <Configuration name="Debug"> | 563 | <Configuration name="Debug"> |
564 | <Options> | 564 | <Options> |
565 | <OutputPath>../bin/</OutputPath> | 565 | <OutputPath>../../bin/</OutputPath> |
566 | </Options> | 566 | </Options> |
567 | </Configuration> | 567 | </Configuration> |
568 | <Configuration name="Release"> | 568 | <Configuration name="Release"> |
569 | <Options> | 569 | <Options> |
570 | <OutputPath>../bin/</OutputPath> | 570 | <OutputPath>../../bin/</OutputPath> |
571 | </Options> | 571 | </Options> |
572 | </Configuration> | 572 | </Configuration> |
573 | 573 | ||
574 | <ReferencePath>../bin/</ReferencePath> | 574 | <ReferencePath>../../bin/</ReferencePath> |
575 | <Reference name="System" localCopy="false"/> | 575 | <Reference name="System" localCopy="false"/> |
576 | <Reference name="System.Xml"/> | 576 | <Reference name="System.Xml"/> |
577 | <Reference name="System.Data"/> | 577 | <Reference name="System.Data"/> |
@@ -583,19 +583,19 @@ | |||
583 | </Files> | 583 | </Files> |
584 | </Project> | 584 | </Project> |
585 | 585 | ||
586 | <Project name="OpenGrid.Framework.Data.MSSQL" path="OpenGrid.Framework.Data.MSSQL" type="Library"> | 586 | <Project name="OpenGrid.Framework.Data.MSSQL" path="OpenGridServices/OpenGrid.Framework.Data.MSSQL" type="Library"> |
587 | <Configuration name="Debug"> | 587 | <Configuration name="Debug"> |
588 | <Options> | 588 | <Options> |
589 | <OutputPath>../bin/</OutputPath> | 589 | <OutputPath>../../bin/</OutputPath> |
590 | </Options> | 590 | </Options> |
591 | </Configuration> | 591 | </Configuration> |
592 | <Configuration name="Release"> | 592 | <Configuration name="Release"> |
593 | <Options> | 593 | <Options> |
594 | <OutputPath>../bin/</OutputPath> | 594 | <OutputPath>../../bin/</OutputPath> |
595 | </Options> | 595 | </Options> |
596 | </Configuration> | 596 | </Configuration> |
597 | 597 | ||
598 | <ReferencePath>../bin/</ReferencePath> | 598 | <ReferencePath>../../bin/</ReferencePath> |
599 | <Reference name="System" localCopy="false"/> | 599 | <Reference name="System" localCopy="false"/> |
600 | <Reference name="System.Xml"/> | 600 | <Reference name="System.Xml"/> |
601 | <Reference name="System.Data"/> | 601 | <Reference name="System.Data"/> |
@@ -606,19 +606,19 @@ | |||
606 | </Files> | 606 | </Files> |
607 | </Project> | 607 | </Project> |
608 | 608 | ||
609 | <Project name="OpenGrid.Framework.Data.SQLite" path="OpenGrid.Framework.Data.SQLite" type="Library"> | 609 | <Project name="OpenGrid.Framework.Data.SQLite" path="OpenGridServices/OpenGrid.Framework.Data.SQLite" type="Library"> |
610 | <Configuration name="Debug"> | 610 | <Configuration name="Debug"> |
611 | <Options> | 611 | <Options> |
612 | <OutputPath>../bin/</OutputPath> | 612 | <OutputPath>../../bin/</OutputPath> |
613 | </Options> | 613 | </Options> |
614 | </Configuration> | 614 | </Configuration> |
615 | <Configuration name="Release"> | 615 | <Configuration name="Release"> |
616 | <Options> | 616 | <Options> |
617 | <OutputPath>../bin/</OutputPath> | 617 | <OutputPath>../../bin/</OutputPath> |
618 | </Options> | 618 | </Options> |
619 | </Configuration> | 619 | </Configuration> |
620 | 620 | ||
621 | <ReferencePath>../bin/</ReferencePath> | 621 | <ReferencePath>../../bin/</ReferencePath> |
622 | <Reference name="System" localCopy="false"/> | 622 | <Reference name="System" localCopy="false"/> |
623 | <Reference name="System.Xml"/> | 623 | <Reference name="System.Xml"/> |
624 | <Reference name="System.Data"/> | 624 | <Reference name="System.Data"/> |
@@ -632,19 +632,19 @@ | |||
632 | 632 | ||
633 | <!-- OGS projects --> | 633 | <!-- OGS projects --> |
634 | 634 | ||
635 | <Project name="OpenGrid.Framework.Manager" path="OpenGrid.Framework.Manager" type="Library"> | 635 | <Project name="OpenGrid.Framework.Manager" path="OpenGridServices/OpenGrid.Framework.Manager" type="Library"> |
636 | <Configuration name="Debug"> | 636 | <Configuration name="Debug"> |
637 | <Options> | 637 | <Options> |
638 | <OutputPath>../bin/</OutputPath> | 638 | <OutputPath>../../bin/</OutputPath> |
639 | </Options> | 639 | </Options> |
640 | </Configuration> | 640 | </Configuration> |
641 | <Configuration name="Release"> | 641 | <Configuration name="Release"> |
642 | <Options> | 642 | <Options> |
643 | <OutputPath>../bin/</OutputPath> | 643 | <OutputPath>../../bin/</OutputPath> |
644 | </Options> | 644 | </Options> |
645 | </Configuration> | 645 | </Configuration> |
646 | 646 | ||
647 | <ReferencePath>../bin/</ReferencePath> | 647 | <ReferencePath>../../bin/</ReferencePath> |
648 | <Reference name="System" localCopy="false"/> | 648 | <Reference name="System" localCopy="false"/> |
649 | <Reference name="OpenSim.Framework"/> | 649 | <Reference name="OpenSim.Framework"/> |
650 | <Reference name="OpenSim.Servers"/> | 650 | <Reference name="OpenSim.Servers"/> |
@@ -658,19 +658,19 @@ | |||
658 | </Project> | 658 | </Project> |
659 | 659 | ||
660 | 660 | ||
661 | <Project name="ServiceManager" path="ServiceManager" type="Exe"> | 661 | <Project name="ServiceManager" path="OpenGridServices/ServiceManager" type="Exe"> |
662 | <Configuration name="Debug"> | 662 | <Configuration name="Debug"> |
663 | <Options> | 663 | <Options> |
664 | <OutputPath>../bin/</OutputPath> | 664 | <OutputPath>../../bin/</OutputPath> |
665 | </Options> | 665 | </Options> |
666 | </Configuration> | 666 | </Configuration> |
667 | <Configuration name="Release"> | 667 | <Configuration name="Release"> |
668 | <Options> | 668 | <Options> |
669 | <OutputPath>../bin/</OutputPath> | 669 | <OutputPath>../../bin/</OutputPath> |
670 | </Options> | 670 | </Options> |
671 | </Configuration> | 671 | </Configuration> |
672 | 672 | ||
673 | <ReferencePath>../bin/</ReferencePath> | 673 | <ReferencePath>../../bin/</ReferencePath> |
674 | <Reference name="System" localCopy="false"/> | 674 | <Reference name="System" localCopy="false"/> |
675 | <Reference name="System.ServiceProcess" localCopy="false"/> | 675 | <Reference name="System.ServiceProcess" localCopy="false"/> |
676 | <Reference name="System.Xml" localCopy="false"/> | 676 | <Reference name="System.Xml" localCopy="false"/> |
@@ -681,19 +681,19 @@ | |||
681 | </Project> | 681 | </Project> |
682 | 682 | ||
683 | 683 | ||
684 | <Project name="OpenGridServices.GridServer" path="OpenGridServices.GridServer" type="Exe"> | 684 | <Project name="OpenGridServices.GridServer" path="OpenGridServices/OpenGridServices.GridServer" type="Exe"> |
685 | <Configuration name="Debug"> | 685 | <Configuration name="Debug"> |
686 | <Options> | 686 | <Options> |
687 | <OutputPath>../bin/</OutputPath> | 687 | <OutputPath>../../bin/</OutputPath> |
688 | </Options> | 688 | </Options> |
689 | </Configuration> | 689 | </Configuration> |
690 | <Configuration name="Release"> | 690 | <Configuration name="Release"> |
691 | <Options> | 691 | <Options> |
692 | <OutputPath>../bin/</OutputPath> | 692 | <OutputPath>../../bin/</OutputPath> |
693 | </Options> | 693 | </Options> |
694 | </Configuration> | 694 | </Configuration> |
695 | 695 | ||
696 | <ReferencePath>../bin/</ReferencePath> | 696 | <ReferencePath>../../bin/</ReferencePath> |
697 | <Reference name="System" localCopy="false"/> | 697 | <Reference name="System" localCopy="false"/> |
698 | <Reference name="System.Data" localCopy="false"/> | 698 | <Reference name="System.Data" localCopy="false"/> |
699 | <Reference name="System.Xml" localCopy="false"/> | 699 | <Reference name="System.Xml" localCopy="false"/> |
@@ -711,19 +711,19 @@ | |||
711 | </Files> | 711 | </Files> |
712 | </Project> | 712 | </Project> |
713 | 713 | ||
714 | <Project name="OpenGridServices.AssetServer" path="OpenGridServices.AssetServer" type="Exe"> | 714 | <Project name="OpenGridServices.AssetServer" path="OpenGridServices/OpenGridServices.AssetServer" type="Exe"> |
715 | <Configuration name="Debug"> | 715 | <Configuration name="Debug"> |
716 | <Options> | 716 | <Options> |
717 | <OutputPath>../bin/</OutputPath> | 717 | <OutputPath>../../bin/</OutputPath> |
718 | </Options> | 718 | </Options> |
719 | </Configuration> | 719 | </Configuration> |
720 | <Configuration name="Release"> | 720 | <Configuration name="Release"> |
721 | <Options> | 721 | <Options> |
722 | <OutputPath>../bin/</OutputPath> | 722 | <OutputPath>../../bin/</OutputPath> |
723 | </Options> | 723 | </Options> |
724 | </Configuration> | 724 | </Configuration> |
725 | 725 | ||
726 | <ReferencePath>../bin/</ReferencePath> | 726 | <ReferencePath>../../bin/</ReferencePath> |
727 | <Reference name="System" localCopy="false"/> | 727 | <Reference name="System" localCopy="false"/> |
728 | <Reference name="System.Data" localCopy="false"/> | 728 | <Reference name="System.Data" localCopy="false"/> |
729 | <Reference name="System.Xml" localCopy="false"/> | 729 | <Reference name="System.Xml" localCopy="false"/> |
@@ -740,19 +740,19 @@ | |||
740 | </Files> | 740 | </Files> |
741 | </Project> | 741 | </Project> |
742 | 742 | ||
743 | <Project name="OpenGridServices.UserServer" path="OpenGridServices.UserServer" type="Exe"> | 743 | <Project name="OpenGridServices.UserServer" path="OpenGridServices/OpenGridServices.UserServer" type="Exe"> |
744 | <Configuration name="Debug"> | 744 | <Configuration name="Debug"> |
745 | <Options> | 745 | <Options> |
746 | <OutputPath>../bin/</OutputPath> | 746 | <OutputPath>../../bin/</OutputPath> |
747 | </Options> | 747 | </Options> |
748 | </Configuration> | 748 | </Configuration> |
749 | <Configuration name="Release"> | 749 | <Configuration name="Release"> |
750 | <Options> | 750 | <Options> |
751 | <OutputPath>../bin/</OutputPath> | 751 | <OutputPath>../../bin/</OutputPath> |
752 | </Options> | 752 | </Options> |
753 | </Configuration> | 753 | </Configuration> |
754 | 754 | ||
755 | <ReferencePath>../bin/</ReferencePath> | 755 | <ReferencePath>../../bin/</ReferencePath> |
756 | <Reference name="System" localCopy="false"/> | 756 | <Reference name="System" localCopy="false"/> |
757 | <Reference name="System.Data" localCopy="false"/> | 757 | <Reference name="System.Data" localCopy="false"/> |
758 | <Reference name="System.Xml" localCopy="false"/> | 758 | <Reference name="System.Xml" localCopy="false"/> |
@@ -771,19 +771,19 @@ | |||
771 | 771 | ||
772 | 772 | ||
773 | 773 | ||
774 | <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGrid.Config/GridConfigDb4o" type="Library"> | 774 | <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGridServices/OpenGrid.Config/GridConfigDb4o" type="Library"> |
775 | <Configuration name="Debug"> | 775 | <Configuration name="Debug"> |
776 | <Options> | 776 | <Options> |
777 | <OutputPath>../../bin/</OutputPath> | 777 | <OutputPath>../../../bin/</OutputPath> |
778 | </Options> | 778 | </Options> |
779 | </Configuration> | 779 | </Configuration> |
780 | <Configuration name="Release"> | 780 | <Configuration name="Release"> |
781 | <Options> | 781 | <Options> |
782 | <OutputPath>../../bin/</OutputPath> | 782 | <OutputPath>../../../bin/</OutputPath> |
783 | </Options> | 783 | </Options> |
784 | </Configuration> | 784 | </Configuration> |
785 | 785 | ||
786 | <ReferencePath>../../bin/</ReferencePath> | 786 | <ReferencePath>../../../bin/</ReferencePath> |
787 | <Reference name="System" localCopy="false"/> | 787 | <Reference name="System" localCopy="false"/> |
788 | <Reference name="System.Data.dll"/> | 788 | <Reference name="System.Data.dll"/> |
789 | <Reference name="System.Xml"/> | 789 | <Reference name="System.Xml"/> |
@@ -796,19 +796,19 @@ | |||
796 | </Files> | 796 | </Files> |
797 | </Project> | 797 | </Project> |
798 | 798 | ||
799 | <Project name="OpenUser.Config.UserConfigDb4o" path="OpenUser.Config/UserConfigDb4o" type="Library"> | 799 | <Project name="OpenUser.Config.UserConfigDb4o" path="OpenGridServices/OpenUser.Config/UserConfigDb4o" type="Library"> |
800 | <Configuration name="Debug"> | 800 | <Configuration name="Debug"> |
801 | <Options> | 801 | <Options> |
802 | <OutputPath>../../bin/</OutputPath> | 802 | <OutputPath>../../../bin/</OutputPath> |
803 | </Options> | 803 | </Options> |
804 | </Configuration> | 804 | </Configuration> |
805 | <Configuration name="Release"> | 805 | <Configuration name="Release"> |
806 | <Options> | 806 | <Options> |
807 | <OutputPath>../../bin/</OutputPath> | 807 | <OutputPath>../../../bin/</OutputPath> |
808 | </Options> | 808 | </Options> |
809 | </Configuration> | 809 | </Configuration> |
810 | 810 | ||
811 | <ReferencePath>../../bin/</ReferencePath> | 811 | <ReferencePath>../../../bin/</ReferencePath> |
812 | <Reference name="System" localCopy="false"/> | 812 | <Reference name="System" localCopy="false"/> |
813 | <Reference name="System.Data.dll"/> | 813 | <Reference name="System.Data.dll"/> |
814 | <Reference name="System.Xml"/> | 814 | <Reference name="System.Xml"/> |