diff --git a/BUILD/BUILD.md b/BUILD/BUILD.md deleted file mode 100644 index 2fa0a657..00000000 --- a/BUILD/BUILD.md +++ /dev/null @@ -1,18 +0,0 @@ - - -TODO: make this buildinstruction look nice - -Step 1) build docker container -run "docker build -t Xcross ." - -Step 2) start container -run "docker run --rm -it Xcross bash" - -Step 3) login as user jenkins -inside the docker container run "su -l jenkins" - -Step 4) copy and paste build.txt into the container shell - -Step 5) wait for it to compile - -Step 6) profit! diff --git a/BUILD/wincross/Dockerfile b/BUILD/wincross/Dockerfile deleted file mode 100644 index 90b55984..00000000 --- a/BUILD/wincross/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -# This Dockerfile is used to build an image containing basic stuff to be used as a Jenkins slave build node. -FROM ubuntu:trusty - -# In case you need proxy -#RUN echo 'Acquire::http::Proxy "http://127.0.0.1:8080";' >> /etc/apt/apt.conf - -# Add locales after locale-gen as needed -# Upgrade packages on image -# Preparations for sshd -run locale-gen en_US.UTF-8 &&\ - apt-get -q update &&\ - DEBIAN_FRONTEND="noninteractive" apt-get -q upgrade -y -o Dpkg::Options::="--force-confnew" --no-install-recommends &&\ - DEBIAN_FRONTEND="noninteractive" apt-get -q install -y -o Dpkg::Options::="--force-confnew" --no-install-recommends openssh-server &&\ - apt-get -q autoremove &&\ - apt-get -q clean -y && rm -rf /var/lib/apt/lists/* && rm -f /var/cache/apt/*.bin &&\ - sed -i 's|session required pam_loginuid.so|session optional pam_loginuid.so|g' /etc/pam.d/sshd &&\ - mkdir -p /var/run/sshd - -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 - -# Install JDK 7 (latest edition) -RUN apt-get -q update &&\ - DEBIAN_FRONTEND="noninteractive" apt-get -q install -y -o Dpkg::Options::="--force-confnew" --no-install-recommends openjdk-7-jre-headless &&\ - apt-get -q clean -y && rm -rf /var/lib/apt/lists/* && rm -f /var/cache/apt/*.bin - -# Set user jenkins to the image -RUN useradd -m -d /home/jenkins -s /bin/bash jenkins &&\ - echo "jenkins:jenkins" | chpasswd - -# Standard SSH port -EXPOSE 22 - -RUN apt-get update &&\ - apt-get -q install -y -o Dpkg::Options::="--force-confnew" --no-install-recommends autoconf automake autopoint bash bison bzip2 flex gettext\ - git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev libtool libltdl-dev libssl-dev libxml-parser-perl make \ - openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils g++-multilib libc6-dev-i386 libtool python-dev libreadline-dev zip &&\ - apt-get -q clean -y && rm -rf /var/lib/apt/lists/* && rm -f /var/cache/apt/*.bin - -USER jenkins -RUN git clone https://github.com/mxe/mxe.git /home/jenkins/mxe - -USER root -RUN mv /home/jenkins/mxe /opt/mxe - -USER jenkins -RUN echo "export PATH=/opt/mxe/usr/bin:$PATH" >>/home/jenkins/.bash_profile && \ - echo "export PKG_CONFIG_PATH_x86_64_w64_mingw32_static=/opt/mxe/lib/pkgconfig" >>/home/jenkins/.bash_profile - -WORKDIR /opt/mxe -RUN sed -i 's/--without-ssl/--with-ca-bundle=cacert.pem/g' /opt/mxe/src/curl.mk && \ - sed -i '/--with-gnutls \\/d' /opt/mxe/src/curl.mk -RUN make MXE_TARGETS='x86_64-w64-mingw32.static' gcc libxml2 openssl curl lzma readline libusb1 termcap libzip -RUN wget https://curl.haxx.se/ca/cacert.pem -O /opt/mxe/cacert.pem - -WORKDIR /home/jenkins -USER root -# Default command -CMD ["/usr/sbin/sshd", "-D"] diff --git a/BUILD/wincross/build.txt b/BUILD/wincross/build.txt deleted file mode 100644 index bc88069b..00000000 --- a/BUILD/wincross/build.txt +++ /dev/null @@ -1,47 +0,0 @@ -#libplist -git clone https://github.com/libimobiledevice/libplist.git -cd libplist -sed -ie 's/typedef volatile struct {/#elif 0/g' src/plist.c #dirty hack to make other projects, depending on this, work -./autogen.sh --host=x86_64-w64-mingw32.static -without-cython --enable-static --disable-shared --prefix=/opt/mxe -make install -cd .. - -#libusbmuxd -git clone https://github.com/libimobiledevice/libusbmuxd.git -cd libusbmuxd -sed -i '/AC_FUNC_MALLOC/d' configure.ac -sed -i '/AC_FUNC_REALLOC/d' configure.ac -./autogen.sh --host=x86_64-w64-mingw32.static --enable-static --disable-shared --prefix=/opt/mxe -make install -cd .. - -#libimobiledevice -git clone https://github.com/libimobiledevice/libimobiledevice.git -cd libimobiledevice -./autogen.sh --host=x86_64-w64-mingw32.static -without-cython --enable-static --disable-shared --prefix=/opt/mxe -make install -cd .. - -#libpartialzip -git clone https://github.com/tihmstar/libfragmentzip.git -cd libfragmentzip -./autogen.sh --host=x86_64-w64-mingw32.static --enable-static --disable-shared --prefix=/opt/mxe -make install -cd .. - -#libirecovery -git clone https://github.com/tihmstar/libirecovery.git -cd libirecovery -sed -i '/AC_FUNC_MALLOC/d' configure.ac -./autogen.sh --host=x86_64-w64-mingw32.static --prefix=/opt/mxe -make install -cd .. - -#tsscheker -git clone https://github.com/tihmstar/tsschecker.git -cd tsschecker -sed -i '/AC_FUNC_MALLOC/d' configure.ac -sed -i '/AC_FUNC_REALLOC/d' configure.ac -./autogen.sh --host=x86_64-w64-mingw32.static --prefix=/opt/mxe -make install -cp tsschecker/tsschecker.exe . diff --git a/tsschecker.xcodeproj/project.xcworkspace/xcuserdata/tihmstar.xcuserdatad/UserInterfaceState.xcuserstate b/tsschecker.xcodeproj/project.xcworkspace/xcuserdata/tihmstar.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index e193ab0e..00000000 Binary files a/tsschecker.xcodeproj/project.xcworkspace/xcuserdata/tihmstar.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/tsschecker/tsschecker.c b/tsschecker/tsschecker.c index e1b6d198..84efc0a5 100644 --- a/tsschecker/tsschecker.c +++ b/tsschecker/tsschecker.c @@ -16,6 +16,7 @@ #include #include + #include "tsschecker.h" #include "debug.h" #include "download.h" @@ -1089,7 +1090,7 @@ char *getFirmwareUrl(const char *deviceModel, t_iosVersion *versVals, jssytok_t return ret; } -#warning print devices function doesn't actually check if devices are sorted. it assues they are sorted in json +/* Print devices function doesn't actually check if devices are sorted. it assues they are sorted in json */ int printListOfDevices(jssytok_t *tokens){ #define MAX_PER_LINE 10 log("[JSON] printing device list\n");