uuuid class change

diff --git a/Tools/creorgadb.pl b/Tools/creorgadb.pl
index 4966f1a..3891ff5 100644 (file)
--- a/Tools/creorgadb.pl
+++ b/Tools/creorgadb.pl
@@ -6,7 +6,7 @@ use Getopt::Long;
 use Data::Dumper;
 use File::Copy qw/copy/;
 use Time::Local;
-use UUID::Generator::PurePerl;
+use UUID::Tiny ':std';
 
 use utf8;
 use lib ('.');
@@ -120,7 +120,7 @@ foreach my $pd (sort {$a <=> $b} keys(%{$defdbschemacfg})){
         my @ndata = ();
         foreach my $x (@copycols){
          if ($x eq "uuid"){
-           push(@ndata,$ug->generate_v4());
+           push(@ndata,create_uuid());
          } else {
            push(@ndata,$data->{$da}->{$x});
          }

diff --git a/install/create_setup_windows.pl b/install/create_setup_windows.pl
index 1e653a1..e57497b 100644 (file)
--- a/install/create_setup_windows.pl
+++ b/install/create_setup_windows.pl
@@ -119,8 +119,8 @@ rcopy("$releasepath\\tag\\app_v3","$releasepath\\dist\\localmanager");
 
 rcopy("$reppath\\install\\windows\\xulrunner","$releasepath\\dist\\xulrunner");
 
-copy("$reppath\\install\\windows\\xulrunner\\Creorga.exe","$releasepath\\dist\\Creorga.exe");
-copy("$reppath\\install\\windows\\xulrunner\\vc_redist.x86.exe","$releasepath\\dist\\vcredist_x86.exe");
+copy("$reppath\\install\\windows\\Creorga.exe","$releasepath\\dist\\Creorga.exe");
+#copy("$reppath\\install\\windows\\xulrunner\\vc_redist.x86.exe","$releasepath\\dist\\vcredist_x86.exe");
 copy("$releasepath\\tag\\app_v3\\creorga_".$setup.".jar","$releasepath\\dist\\creorga.jar");
 
 rcopy("$releasepath\\tag\\app_v3\\defaults","$releasepath\\dist\\defaults");