ObjFW  Diff

Differences From Artifact [8e068612f0]:

To Artifact [7b285d2590]:


48
49
50
51
52
53
54












55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81



















82
83
84
85
86
87
88
89
90
91
92
93
94
95
96

97
98
99
100

101
102
103
104
105
106
107

    # Nintendo DS and 3DS
    - os: linux
      dist: trusty
      env:
        - config=devkitarm













before_install:
  - if [ "$TRAVIS_OS_NAME" = "linux" -a -z "$config" ]; then
            if ! sudo apt-get -qq update >apt_log 2>&1; then
                    cat apt_log;
                    exit 1;
            fi;
            if ! sudo apt-get -qq install -y gobjc-multilib >apt_log 2>&1; then
                    cat apt_log;
                    exit 1;
            fi;
    fi

  - if [ "$config" == "devkitarm" ]; then
            base_url="https://download.sourceforge.net/project/devkitpro";
            wget -q "$base_url/devkitARM/devkitARM_r46/devkitARM_r46-x86_64-linux.tar.bz2"
                    "$base_url/libctru/1.4.0/libctru-1.4.0.tar.bz2"
                    "$base_url/libnds/1.7.1/libnds-1.7.1.tar.bz2"
                    "$base_url/libfat/1.1.2/libfat-nds-1.1.2.tar.bz2"
                    "$base_url/filesystem/0.9.13-1/libfilesystem-0.9.13-1.tar.bz2";
            mkdir -p "$HOME/devkitPro/libctru";
            tar -C "$HOME/devkitPro" -xjf devkitARM_r46-x86_64-linux.tar.bz2;
            tar -C "$HOME/devkitPro/libctru" -xjf libctru-1.4.0.tar.bz2;
            mkdir -p "$HOME/devkitPro/libnds";
            tar -C "$HOME/devkitPro/libnds" -xjf libnds-1.7.1.tar.bz2;
            tar -C "$HOME/devkitPro/libnds" -xjf libfat-1.1.2.tar.bz2;
            tar -C "$HOME/devkitPro/libnds" -xjf libfilesystem-0.9.13-1.tar.bz2;
    fi




















script:
  - echo -e '%s/-DSTDOUT$/&_SIMPLE/\nwq' | ed -s tests/Makefile

  - build() {
            if ! git clean -fxd >clean_log 2>&1; then
                    cat clean_log;
                    exit 1;
            fi;
            echo ">> Building with $@";
            ./autogen.sh;
            if ! ./configure ac_cv_path_TPUT= "$@"; then
                    cat config.log;
                    exit 1;
            fi;

            if ! make -j4 >make_log 2>&1; then
                    cat make_log;
                    exit 1;
            fi;

            if ! sudo PATH="$PATH" make install >install_log 2>&1; then
                    cat install_log;
                    exit 1;
            fi;
    }

  - if [ "$TRAVIS_OS_NAME" = "linux" -a -z "$config" ]; then







>
>
>
>
>
>
>
>
>
>
>
>












|











|


>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>









|





>




>







48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140

    # Nintendo DS and 3DS
    - os: linux
      dist: trusty
      env:
        - config=devkitarm

    # Nintendo Wii
    - os: linux
      dist: trusty
      env:
        - config=devkitppc

    # PSP
    - os: linux
      dist: trusty
      env:
        - config=devkitpsp

before_install:
  - if [ "$TRAVIS_OS_NAME" = "linux" -a -z "$config" ]; then
            if ! sudo apt-get -qq update >apt_log 2>&1; then
                    cat apt_log;
                    exit 1;
            fi;
            if ! sudo apt-get -qq install -y gobjc-multilib >apt_log 2>&1; then
                    cat apt_log;
                    exit 1;
            fi;
    fi

  - if [ "$config" = "devkitarm" ]; then
            base_url="https://download.sourceforge.net/project/devkitpro";
            wget -q "$base_url/devkitARM/devkitARM_r46/devkitARM_r46-x86_64-linux.tar.bz2"
                    "$base_url/libctru/1.4.0/libctru-1.4.0.tar.bz2"
                    "$base_url/libnds/1.7.1/libnds-1.7.1.tar.bz2"
                    "$base_url/libfat/1.1.2/libfat-nds-1.1.2.tar.bz2"
                    "$base_url/filesystem/0.9.13-1/libfilesystem-0.9.13-1.tar.bz2";
            mkdir -p "$HOME/devkitPro/libctru";
            tar -C "$HOME/devkitPro" -xjf devkitARM_r46-x86_64-linux.tar.bz2;
            tar -C "$HOME/devkitPro/libctru" -xjf libctru-1.4.0.tar.bz2;
            mkdir -p "$HOME/devkitPro/libnds";
            tar -C "$HOME/devkitPro/libnds" -xjf libnds-1.7.1.tar.bz2;
            tar -C "$HOME/devkitPro/libnds" -xjf libfat-nds-1.1.2.tar.bz2;
            tar -C "$HOME/devkitPro/libnds" -xjf libfilesystem-0.9.13-1.tar.bz2;
    fi

  - if [ "$config" = "devkitppc" ]; then
            base_url="https://download.sourceforge.net/project/devkitpro";
            wget -q "$base_url/devkitPPC/devkitPPC_r29-1/devkitPPC_r29-1-x86_64-linux.tar.bz2"
                    "$base_url/libogc/1.8.16/libogc-1.8.16.tar.bz2"
                    "$base_url/libfat/1.1.2/libfat-ogc-1.1.2.tar.bz2";

            mkdir -p "$HOME/devkitPro/libogc";
            tar -C "$HOME/devkitPro" -xjf devkitPPC_r29-1-x86_64-linux.tar.bz2;
            tar -C "$HOME/devkitPro/libogc" -xjf libogc-1.8.16.tar.bz2;
            tar -C "$HOME/devkitPro/libogc" -xjf libfat-ogc-1.1.2.tar.bz2;
    fi

  - if [ "$config" = "devkitpsp" ]; then
            wget -q https://download.sourceforge.net/project/devkitpro/devkitPSP/devkitPSP_r16-1-x86_64-linux.tar.bz2;

            mkdir -p "$HOME/devkitPro";
            tar -C "$HOME/devkitPro" -xjf devkitPSP_r16-1-x86_64-linux.tar.bz2;
    fi

script:
  - echo -e '%s/-DSTDOUT$/&_SIMPLE/\nwq' | ed -s tests/Makefile

  - build() {
            if ! git clean -fxd >clean_log 2>&1; then
                    cat clean_log;
                    exit 1;
            fi;
            echo ">> Configuring with $@";
            ./autogen.sh;
            if ! ./configure ac_cv_path_TPUT= "$@"; then
                    cat config.log;
                    exit 1;
            fi;
            echo ">> Building (configured with $@)";
            if ! make -j4 >make_log 2>&1; then
                    cat make_log;
                    exit 1;
            fi;
            echo ">> Installing (configured with $@)";
            if ! sudo PATH="$PATH" make install >install_log 2>&1; then
                    cat install_log;
                    exit 1;
            fi;
    }

  - if [ "$TRAVIS_OS_NAME" = "linux" -a -z "$config" ]; then
161
162
163
164
165
166
167
168
169
170
171
172
173
174















            sysroot="$(xcrun --sdk iphonesimulator --show-sdk-path)";
            clang="clang --sysroot $sysroot";
            export OBJC="$clang -arch i386 -arch x86_64";
            export OBJCPP="$clang -arch i386 -E";
            build --host=i386-apple-darwin --enable-static;
    fi

  - if [ "$config" = "devkitpro" ]; then
            export DEVKITPRO="$HOME/devkitPro";
            export PATH="$DEVKITPRO/devkitARM/bin:$PATH";

            build --host=arm-none-eabi --with-3ds;
            build --host=arm-none-eabi --with-nds;
    fi






















|






>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
            sysroot="$(xcrun --sdk iphonesimulator --show-sdk-path)";
            clang="clang --sysroot $sysroot";
            export OBJC="$clang -arch i386 -arch x86_64";
            export OBJCPP="$clang -arch i386 -E";
            build --host=i386-apple-darwin --enable-static;
    fi

  - if [ "$config" = "devkitarm" ]; then
            export DEVKITPRO="$HOME/devkitPro";
            export PATH="$DEVKITPRO/devkitARM/bin:$PATH";

            build --host=arm-none-eabi --with-3ds;
            build --host=arm-none-eabi --with-nds;
    fi

  - if [ "$config" = "devkitppc" ]; then
            export DEVKITPRO="$HOME/devkitPro";
            export PATH="$DEVKITPRO/devkitPPC/bin:$PATH";

            build ac_cv_prog_wiiload= --host=powerpc-eabi --with-wii;
    fi

  - if [ "$config" = "devkitpsp" ]; then
            export DEVKITPRO="$HOME/devkitPro";
            export DEVKITPSP="$DEVKITPRO/devkitPSP";
            export PATH="$DEVKITPSP/bin:$PATH";

            build --host=psp;
    fi