X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=scripts%2Fupdate_cpve.pl;h=ae1739821c3d0de8605bcdeea930c22e44fd74f4;hb=cb6d7d503d1e051da6fabf77252b07e00fd4e2b2;hp=6f5555582d25232965b8adffd6fc56f768a57a06;hpb=ead4f202d58421c31b50ef662d1ee5429543599c;p=dotfiles.git

diff --git a/scripts/update_cpve.pl b/scripts/update_cpve.pl
index 6f55555..ae17398 100755
--- a/scripts/update_cpve.pl
+++ b/scripts/update_cpve.pl
@@ -10,8 +10,11 @@ print "-n $options{n}\n" if defined $options{n};
 
 my $ip = (split / /, `ifconfig | grep "inet .*broadcast"`)[1];
 
-my $cpve_dir = '/Users/peli3/CPVE/cpve_trunk/';
-my $ecc_dir = '/Users/peli3/JCC/ecc-p2p/';
+my $cpve_dir = '/Users/peli3-imac/CPVE/cpve_trunk/';
+my $ecc_dir = '/Users/peli3-imac/JCC/ecc-p2p-mac/';
+
+my $ecc_mac_libs = "$ecc_dir/contrib/cpve/lib/darwin/x86_64";
+my $cpve_mac_libs = "$cpve_dir/target/dist/lib/darwin/x86_64";
 
 
 #### 
@@ -26,15 +29,19 @@ else
     !system "scons arch=x86_64 platform=darwin debug=True -j16 osxversion=10.10"    or die "building CPVE failed : $!";
 
     ## remove old cpve libs and replace in ECC
-    !system "rm -rf $ecc_dir/contrib/cpve/lib/darwin/x86_64/*"     or die "remove libs failed : $!";
+#    !system "rm -rf $ecc_dir/contrib/cpve/lib/darwin/x86_64/*"     or die "remove libs failed : $!";
+    !system "rm -rf $ecc_mac_libs/*"     or die "remove libs failed : $!";
+
+    mkdir $ecc_mac_libs unless -e $ecc_mac_libs;
 
-    !system "/bin/cp -r $cpve_dir/target/dist/lib/darwin/x86_64/* $ecc_dir/contrib/cpve/lib/darwin/x86_64/"     or die "copy libs failed: $!";
+    !system "/bin/cp -r $cpve_mac_libs/* $ecc_mac_libs/"     or die "copy libs failed: $!";
 
 }
 
 #### building ecc
 chdir $ecc_dir or die ": $!";
-!system "python runSconsBuild.py JabberMac64Bit  -j 16  -t no --early_cpve"     or die " building ECC failed : $!";
+!system "rm $ecc_dir/contrib/cpve/SConstruct" or die "$!" if -e "$ecc_dir/contrib/cpve/SConstruct";
+!system "python runSconsBuild.py JabberMac64Bit  -j 16  -t no --early_cpve --nofetch"     or die " building ECC failed : $!";
 
 print "copy bin-s bin-c\n";
 !system "rm -rf bin-s/* bin-c/*" or die "$!";
@@ -52,11 +59,3 @@ close CONF;
 
 
 print "####### DONE #######\n";
-
-#sub get_local_ip{
-#    my @cc = (split / /, `ifconfig | grep "inet .*broadcast"`)[1];
-##    @cc[1]; ## return value
-##    return @cc[1];
-#}
-
-#print CONF "P2P_SERVER_IP=" . &get_local_ip . "\n";