@@ -748,34 +748,33 @@ function run_distribute() {
748
748
749
749
cd " $DIST_PATH "
750
750
debug " Create Python directory structure"
751
- try mkdir -p python
752
- try mkdir -p python/app
753
- try mkdir -p python/app_packages
751
+ try mkdir -p app
752
+ try mkdir -p app_packages
754
753
755
754
debug " Copy python distribution"
756
755
# $HOSTPYTHON -OO -m compileall $BUILD_PATH/python-install
757
- try cp -a " $BUILD_PATH /python-install" python/python
756
+ try cp -a " $BUILD_PATH /python-install" python
758
757
759
758
debug " Remove non-distributed parts of Python install"
760
- try rm -rf python/python/ bin
761
- try rm -rf python/python/ share
762
- try rm -rf python/python/ lib/pkgconfig
763
- try rm -rf python/python/ lib/libpython2.7.so
759
+ try rm -rf python/bin
760
+ try rm -rf python/share
761
+ try rm -rf python/lib/pkgconfig
762
+ try rm -rf python/lib/libpython2.7.so
764
763
765
764
debug " Copy libs"
766
765
try cp -a " $BUILD_PATH /libs" .
767
766
768
767
debug " Install rubicon"
768
+
769
769
# (Naive) Install of Python library
770
- try cp -r " $BUILD_rubicon /rubicon" python/app_packages
770
+ try cp -r " $BUILD_rubicon /rubicon" python/lib/python2.7/site-packages
771
771
772
- debug " Install accessible copy of Rubicon library"
773
- try mkdir -p python/rubicon/$ARCH
774
- try cp -r libs/$ARCH /librubicon.so python/rubicon/$ARCH /librubicon.so
772
+ debug " Fix permissions"
773
+ try cp -a " $BUILD_PATH /libs" .
775
774
776
775
debug " Strip libraries"
777
776
push_arm
778
- try find " $DIST_PATH /python/python " " $DIST_PATH / libs" -iname ' *.so' -exec $STRIP {} \;
777
+ try find " $DIST_PATH /libs" -iname ' *.so' -exec $STRIP {} \;
779
778
pop_arm
780
779
}
781
780
0 commit comments